Convert #336369 to Flügger