Convert #517778 to Flügger