Convert #517517 to Flügger