A stripdown, deburr and relube will do wonders for it. Also make sure barrel is properly clean, and check muzzle crown. I can't speak for the 17, but I know people with 19's and 20's who have had good results with this treatment, and now achieve good groups. For further info, see link below.
http://ukchineseairgunforum.myfreeforum.org/