Convert #624377 to Flügger