Convert #624235 to Flügger