Convert #336153 to Flügger