Convert #336342 to Flügger