Convert #624979 to Flügger