Convert #624295 to Flügger