diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
index 449d816e76e606f070af310ef7840027a388d396..3fadc7abaf0aa2ae96e87cae77c6ce1a2b3df742 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -3921,7 +3921,9 @@ void* createQInfoFromQueryNode(SQueryInfo* pQueryInfo, STableGroupInfo* pTableGr
   } else if (pQueryAttr->pExpr2 != NULL) {
     pEx = pQueryAttr->pExpr2;
     num = pQueryAttr->numOfExpr2;
-  } else {
+  }
+
+  if ( num < pQueryAttr->numOfOutput) {
     pEx = pQueryAttr->pExpr1;
     num = pQueryAttr->numOfOutput;
   }