Convert #624039 to Flügger