Bug fix for menu change