Convert #517907 to Flügger