Convert #624739 to Flügger