Convert #624615 to Flügger