Convert #517738 to Flügger