Fixed sporadic shot bug