Convert #721237 to Flügger