Convert #721686 to Flügger