Added workaround for MenuBar crash bug