patch for HQ problem