Convert #624074 to Flügger