Possibly fix weapon switching