Patch for menu deactivation fix