Convert #517930 to Flügger