Convert #624670 to Flügger