Convert #624486 to Flügger