Convert #517935 to Flügger