Convert #624525 to Flügger