Convert #517487 to Flügger