Convert #517845 to Flügger