Convert #469825 to Flügger