Convert #469598 to Flügger