Convert #624029 to Flügger