Convert #336364 to Flügger