Convert #336579 to Flügger