Convert #721629 to Flügger