diff --git a/source/common/src/trow.c b/source/common/src/trow.c
index 261b6e1d67..50e51a40dd 100644
--- a/source/common/src/trow.c
+++ b/source/common/src/trow.c
@@ -670,7 +670,7 @@ int tdMergeDataCols(SDataCols *target, SDataCols *source, int rowsToMerge, int *
         }
       }
     }
-    if (rowsToMerge > 0) {
+    if (lastKey != TSKEY_INITIAL_VAL) {
       ++target->numOfRows;
     }
     (*pOffset) += rowsToMerge;
@@ -778,7 +778,7 @@ static void tdMergeTwoDataCols(SDataCols *target, SDataCols *src1, int *iter1, i
 
     ASSERT(target->numOfRows <= target->maxPoints - 1);
   }
-  if (nRows > 0) {
+  if (lastKey != TSKEY_INITIAL_VAL) {
     ++target->numOfRows;
   }
 }
diff --git a/source/dnode/vnode/src/tsdb/tsdbRead.c b/source/dnode/vnode/src/tsdb/tsdbRead.c
index 54b3eea988..aa305dd71c 100644
--- a/source/dnode/vnode/src/tsdb/tsdbRead.c
+++ b/source/dnode/vnode/src/tsdb/tsdbRead.c
@@ -816,9 +816,10 @@ static TSKEY extractFirstTraverseKey(STableCheckInfo* pCheckInfo, int32_t order,
     SSkipListNode* node = tSkipListIterGet(pCheckInfo->iter);
     if (node != NULL) {
       rmem = (STSRow*)SL_GET_NODE_DATA(node);
-      if (TD_ROW_KEY(rmem) > maxVer) {
-        rmem = NULL;
-      }
+      // TODO: filter max version
+      // if (TD_ROW_VER(rmem) > maxVer) {
+      //   rmem = NULL;
+      // }
     }
   }
 
@@ -826,9 +827,10 @@ static TSKEY extractFirstTraverseKey(STableCheckInfo* pCheckInfo, int32_t order,
     SSkipListNode* node = tSkipListIterGet(pCheckInfo->iiter);
     if (node != NULL) {
       rimem = (STSRow*)SL_GET_NODE_DATA(node);
-      if (TD_ROW_KEY(rimem) > maxVer) {
-        rimem = NULL;
-      }
+      // TODO: filter max version
+      // if (TD_ROW_VER(rimem) > maxVer) {
+      //   rimem = NULL;
+      // }
     }
   }