Convert #624907 to Flügger