Convert #624241 to Flügger