Convert #624639 to Flügger