Convert #653697 to Flügger