Convert #517971 to Flügger