Definately contact CVA. At one time, maybe still, they would replace the barrel with an updated one. Now, they may replace the whole gun but I'm not sure about that. A friend of mine had one years ago and they sent him a replacement barrel, unfortunately the old barrel shot better than the new barrel but at least it complied with the new safety guidelines. Good luck with it and be safe.