Convert #624619 to Flügger