Convert #517489 to Flügger