Fixed weapon issue