Convert #624189 to Flügger