Convert #336955 to Flügger