Fixed issue with menu bug