Convert #336837 to Flügger