Convert #624931 to Flügger