Convert #469329 to Flügger