Fixed weapon highlighting