Fixed menu/state glitch