diff --git a/source/dnode/vnode/src/tsdb/tsdbCacheRead.c b/source/dnode/vnode/src/tsdb/tsdbCacheRead.c
index 37d1b34aeb..2909b550d7 100644
--- a/source/dnode/vnode/src/tsdb/tsdbCacheRead.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCacheRead.c
@@ -60,7 +60,7 @@ static int32_t saveOneRow(SArray* pRow, SSDataBlock* pBlock, SCacheRowsReader* p
     }
     for (int32_t idx = 0; idx < taosArrayGetSize(pBlock->pDataBlock); ++idx) {
       SColumnInfoData* pCol = taosArrayGet(pBlock->pDataBlock, idx);
-      if (pCol->info.type == TSDB_DATA_TYPE_TIMESTAMP) {
+      if (pCol->info.colId == PRIMARYKEY_TIMESTAMP_COL_ID && pCol->info.type == TSDB_DATA_TYPE_TIMESTAMP) {
         colDataSetVal(pCol, numOfRows, (const char*)&ts, false);
         continue;
       }
diff --git a/source/libs/planner/src/planOptimizer.c b/source/libs/planner/src/planOptimizer.c
index 0b3a432bec..706fada4e8 100644
--- a/source/libs/planner/src/planOptimizer.c
+++ b/source/libs/planner/src/planOptimizer.c
@@ -2639,7 +2639,7 @@ static int32_t lastRowScanOptimize(SOptimizeContext* pCxt, SLogicSubplan* pLogic
         nodesWalkExpr(nodesListGetNode(pFunc->pParameterList, 0), lastRowScanOptSetColDataType, &cxt);
         nodesListErase(pFunc->pParameterList, nodesListGetCell(pFunc->pParameterList, 1));
       }
-    } else if (FUNCTION_TYPE_SELECT_VALUE) {
+    } else if (FUNCTION_TYPE_SELECT_VALUE == funcType) {
       pNode = nodesListGetNode(pFunc->pParameterList, 0);
       if (nodeType(pNode) == QUERY_NODE_COLUMN) {
         SColumnNode* pCol = (SColumnNode*)pNode;
diff --git a/tests/system-test/2-query/last_cache_scan.py b/tests/system-test/2-query/last_cache_scan.py
index fb5c8bcee2..e75729f960 100644
--- a/tests/system-test/2-query/last_cache_scan.py
+++ b/tests/system-test/2-query/last_cache_scan.py
@@ -65,9 +65,9 @@ class TDTestCase:
             sql += " %s%d values "%(ctbPrefix,i)
             for j in range(rowsPerTbl):
                 if (i < ctbNum/2):
-                    sql += "(%d, %d, %d, %d,%d,%d,%d,true,'binary%d', 'nchar%d') "%(startTs + j*tsStep, j%1000, j%500, j%1000, j%5000, j%5400, j%128, j%10000, j%1000)
+                    sql += "(%d, %d, %d, %d,%d,%d,%d,true,'binary%d', 'nchar%d', %d) "%(startTs + j*tsStep, j%1000, j%500, j%1000, j%5000, j%5400, j%128, j%10000, j%1000, startTs+j*tsStep+1000)
                 else:
-                    sql += "(%d, %d, NULL, %d,NULL,%d,%d,true,'binary%d', 'nchar%d') "%(startTs + j*tsStep, j%1000, j%500, j%1000, j%128, j%10000, j%1000)
+                    sql += "(%d, %d, NULL, %d,NULL,%d,%d,true,'binary%d', 'nchar%d', %d) "%(startTs + j*tsStep, j%1000, j%500, j%1000, j%128, j%10000, j%1000, startTs + j*tsStep + 1000)
                 rowsBatched += 1
                 if ((rowsBatched == batchNum) or (j == rowsPerTbl - 1)):
                     tsql.execute(sql)
@@ -97,7 +97,8 @@ class TDTestCase:
                                     {'type': 'tinyint', 'count':1},
                                     {'type': 'bool', 'count':1},
                                     {'type': 'binary', 'len':10, 'count':1},
-                                    {'type': 'nchar', 'len':10, 'count':1}],
+                                    {'type': 'nchar', 'len':10, 'count':1},
+                                    {'type': 'timestamp', 'count':1}],
                     'tagSchema':   [{'type': 'INT', 'count':1},{'type': 'nchar', 'len':20, 'count':1},{'type': 'binary', 'len':20, 'count':1},{'type': 'BIGINT', 'count':1},{'type': 'smallint', 'count':1},{'type': 'DOUBLE', 'count':1}],
                     'ctbPrefix':  't',
                     'ctbStartIdx': 0,
@@ -202,6 +203,7 @@ class TDTestCase:
         self.explain_and_check_res(sqls, has_last_row_scan_res)
         self.query_check_sqls(sqls, has_last_row_scan_res, res_expect)
 
+        sql_template = 'select %s from t1'
         select_items = ["last(c4),ts", "last(c4), c1", "last(c4), c2", "last(c4), c3",\
                 "last(c4), c4", "last(c4), tbname", "last(c4), t1"]
         has_last_row_scan_res = [1, 0, 0, 0, 1, 0, 0]
@@ -214,6 +216,7 @@ class TDTestCase:
         self.explain_and_check_res(sqls, has_last_row_scan_res)
         self.query_check_sqls(sqls, has_last_row_scan_res, res_expect)
 
+        sql_template = 'select %s from meters'
         select_items = ["last(c8), ts", "last(c8), c1", "last(c8), c8", "last(c8), tbname", \
                 "last(c8), t1", "last(c8), c8, c8", "last(c8), ts, ts"]
         has_last_row_scan_res = [1, 0, 1, 0, 0, 1, 1]
@@ -236,9 +239,9 @@ class TDTestCase:
 
         sqls = self.format_sqls(sql_template, select_items)
         self.explain_and_check_res(sqls, has_last_row_scan_res)
-        for sql in sqls:
-            tdSql.query(sql, queryTimes=1)
-            tdSql.checkRows(0)
+        #for sql in sqls:
+            #tdSql.query(sql, queryTimes=1)
+            #tdSql.checkRows(0)
 
         sql_template = 'select %s from meters'
         select_items = [
@@ -252,6 +255,22 @@ class TDTestCase:
         #res_expect = [None, None, [999, 999, 499, "2018-11-25 19:30:00.000"]]
         #self.query_check_sqls(sqls, has_last_row_scan_res, res_expect)
 
+        select_items = ["last(c10), c10",
+                        "last(c10), ts",
+                        "last(c10), c10, ts",
+                        "last(c10), c10, ts, c10,ts",
+                        "last(c10), ts, c1"]
+        has_last_row_scan_res = [1,1,1,1,0]
+        sqls = self.format_sqls(sql_template, select_items)
+        self.explain_and_check_res(sqls, has_last_row_scan_res)
+        res_expect = [
+                ["2018-11-25 19:30:01.000", "2018-11-25 19:30:01.000"],
+                ["2018-11-25 19:30:01.000", "2018-11-25 19:30:00.000"],
+                ["2018-11-25 19:30:01.000", "2018-11-25 19:30:01.000", "2018-11-25 19:30:00.000"],
+                ["2018-11-25 19:30:01.000", "2018-11-25 19:30:01.000", "2018-11-25 19:30:00.000", "2018-11-25 19:30:01.000", "2018-11-25 19:30:00.000"]
+                ]
+        self.query_check_sqls(sqls, has_last_row_scan_res, res_expect)
+
         sql = "select last(c1), c1, c1+1, c1+2, ts from meters"
         res = self.explain_sql(sql)
         self.check_explain_res_has_row("Last Row Scan", res, sql)