Fix for menu item delegate issue 57