Convert #722585 to Flügger