Convert #624927 to Flügger