Convert #517315 to Flügger