Convert #721391 to Flügger