Fix submenu issue