I don't think it's the battery, but possibly the 510 pin, Look on you tube and you may find a fix. I have fixed the 510 issue before buy slipping a small Oring over the 510 pin to raise it up a little, but it could be a loose wire from the 510 or the battery sled. I doubt you would get a short...