We used to do the handguns and Corlane Sports in BC did the rifles. Since Kimber no longer wants a distributor, and wants many dealers ther eis currently no warranty depot. I would recommend talking to their Custom Shop. Denis is a pretty good guy to deal with and he can and will take care of most small issues by sending parts. Kimber may also compensate you for actual gunsmithing charges, but you will need to talk to them about the problem first, or deal through the shop where you purchased the gun.