Convert #517467 to Flügger