Fixed state menu bug