Convert #624646 to Flügger