Convert #517947 to Flügger