Convert #721837 to Flügger