Convert #517937 to Flügger