Convert #624867 to Flügger