Convert #517399 to Flügger