Convert #518438 to Flügger