Convert #336177 to Flügger