Convert #517983 to Flügger