diff --git a/source/libs/planner/src/planOptimizer.c b/source/libs/planner/src/planOptimizer.c
index fcc395af62..98b0ce2007 100644
--- a/source/libs/planner/src/planOptimizer.c
+++ b/source/libs/planner/src/planOptimizer.c
@@ -2271,7 +2271,7 @@ static int32_t tagScanOptimize(SOptimizeContext* pCxt, SLogicSubplan* pLogicSubp
     FOREACH(pAggTarget, pAgg->pTargets) {
       SNode* pScanTarget = NULL;
       FOREACH(pScanTarget, pScanNode->node.pTargets) {
-        if (0 == strcmp(((SColumnNode*)pAggTarget)->colName, ((SColumnNode*)pAggTarget)->colName)) {
+        if (0 == strcmp(((SColumnNode*)pAggTarget)->colName, ((SColumnNode*)pScanTarget)->colName)) {
           nodesListAppend(pScanTargets, nodesCloneNode(pScanTarget));
           break;
         }
diff --git a/tests/script/tsim/parser/select_with_tags.sim b/tests/script/tsim/parser/select_with_tags.sim
index 7a2c1217e9..b3247c233e 100644
--- a/tests/script/tsim/parser/select_with_tags.sim
+++ b/tests/script/tsim/parser/select_with_tags.sim
@@ -360,8 +360,9 @@ endi
 if $data04 != @abc0@ then
    return -1
 endi
-
-sql select distinct tbname,t1,t2 from select_tags_mt0;
+print "really this line"
+sql select distinct tbname,t1,t2 from select_tags_mt0 order by tbname;
+print $data00 $data01 $data02 $data10 $data111 $data12
 if $row != 16 then
    return -1
 endi
@@ -390,7 +391,7 @@ if $data12 != @abc1@ then
    return -1
 endi
 
-sql select tbname,ts from select_tags_mt0;
+sql select tbname,ts from select_tags_mt0 order by ts;
 if $row != 12800 then
    return -1
 endi