Fixed weapon switching during scroll