Convert #517238 to Flügger