Convert #336598 to Flügger