Convert #517417 to Flügger