Convert #721769 to Flügger