Convert #390609 to Flügger