Convert #336136 to Flügger