diff --git a/source/libs/executor/src/executil.c b/source/libs/executor/src/executil.c
index ec2c819cf3..a98accba77 100644
--- a/source/libs/executor/src/executil.c
+++ b/source/libs/executor/src/executil.c
@@ -96,9 +96,9 @@ static void freeEx(void* p) {
 void cleanupGroupResInfo(SGroupResInfo* pGroupResInfo) {
   taosMemoryFreeClear(pGroupResInfo->pBuf);
   if (pGroupResInfo->freeItem) {
-    taosArrayDestroy(pGroupResInfo->pRows);
-//    taosArrayDestroyEx(pGroupResInfo->pRows, freeEx);
-//    pGroupResInfo->freeItem = false;
+//    taosArrayDestroy(pGroupResInfo->pRows);
+    taosArrayDestroyEx(pGroupResInfo->pRows, freeEx);
+    pGroupResInfo->freeItem = false;
     pGroupResInfo->pRows = NULL;
   } else {
     pGroupResInfo->pRows = taosArrayDestroy(pGroupResInfo->pRows);
diff --git a/source/libs/executor/src/timewindowoperator.c b/source/libs/executor/src/timewindowoperator.c
index 0472b90338..c5dc927bd1 100644
--- a/source/libs/executor/src/timewindowoperator.c
+++ b/source/libs/executor/src/timewindowoperator.c
@@ -2880,6 +2880,8 @@ int32_t initBasicInfoEx(SOptrBasicInfo* pBasicInfo, SExprSupp* pSup, SExprInfo*
 void initDummyFunction(SqlFunctionCtx* pDummy, SqlFunctionCtx* pCtx, int32_t nums) {
   for (int i = 0; i < nums; i++) {
     pDummy[i].functionId = pCtx[i].functionId;
+    pDummy[i].isNotNullFunc = pCtx[i].isNotNullFunc;
+    pDummy[i].isPseudoFunc = pCtx[i].isPseudoFunc;
   }
 }