Fix main menu being skipped ot early