Convert #721929 to Flügger