Convert #517391 to Flügger