Convert #391738 to Flügger