diff --git a/source/libs/command/src/command.c b/source/libs/command/src/command.c
index 7d259fe06c..18d839e109 100644
--- a/source/libs/command/src/command.c
+++ b/source/libs/command/src/command.c
@@ -471,6 +471,7 @@ static int32_t setCreateTBResultIntoDataBlock(SSDataBlock* pBlock, SDbCfgInfo* p
     len += sprintf(buf2 + VARSTR_HEADER_SIZE, "CREATE TABLE `%s` (", tbName);
     appendColumnFields(buf2, &len, pCfg);
     len += sprintf(buf2 + VARSTR_HEADER_SIZE + len, ")");
+    appendTableOptions(buf2, &len, pDbCfg, pCfg);
   }
 
   varDataLen(buf2) = len;
diff --git a/source/libs/parser/src/parInsert.c b/source/libs/parser/src/parInsert.c
index 56fbafe76d..049d1ef545 100644
--- a/source/libs/parser/src/parInsert.c
+++ b/source/libs/parser/src/parInsert.c
@@ -1669,6 +1669,10 @@ int32_t parseInsertSql(SParseContext* pContext, SQuery** pQuery, SParseMetaCache
       pDb = taosHashIterate(context.pDbFNameHashObj, pDb);
     }
   }
+  if (pContext->pStmtCb) {
+    context.pVgroupsHashObj = NULL;
+    context.pTableBlockHashObj = NULL;
+  }  
   destroyInsertParseContext(&context);
   return code;
 }