Bug fix for menu