Convert #387717 to Flügger