Convert #336917 to Flügger