Fixed another bug in numeric weapon switching