Convert #624429 to Flügger