Convert #336380 to Flügger