Convert #517406 to Flügger