Convert #517905 to Flügger