Convert #624417 to Flügger