Convert #624484 to Flügger