Convert #721829 to Flügger