Convert #624684 to Flügger