Convert #517597 to Flügger