Fixed switching between weapons