Convert #624642 to Flügger