Convert #517029 to Flügger