Merge pull request #638 from CometHunter92/fix_menu_skip