Convert #721828 to Flügger