Convert #517521 to Flügger