Convert #517442 to Flügger