Convert #624677 to Flügger