Convert #624229 to Flügger