Fixed bug with weapons & charges