Convert #624535 to Flügger