Convert #624985 to Flügger