Convert #721636 to Flügger