Convert #624674 to Flügger