Convert #624085 to Flügger