Convert #721637 to Flügger