Convert #517031 to Flügger