Convert #336695 to Flügger