Fixing logic and model for weapons