fix improper weapon switching bug