Added hotfix for menu options