Convert #721677 to Flügger