Convert #517581 to Flügger