Convert #336382 to Flügger