Convert #614993 to Flügger