Convert #517343 to Flügger