Convert #721930 to Flügger