Convert #721614 to Flügger