Fixing submenu bug