Convert #336980 to Flügger