Convert #469909 to Flügger