Convert #721906 to Flügger