Fixed possible issue of weapon duplication