Convert #336905 to Flügger