Convert #517425 to Flügger