diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index 25fcba77315e870a2a2672020847ee95e2d002ad..b82f06fa00f33370b21c4e4ef9bb3d540f9ecdf8 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -2261,10 +2261,6 @@ static int64_t doScanAllDataBlocks(SQueryRuntimeEnv *pRuntimeEnv) {
         pWindowResInfo->startTime = pQuery->window.skey;
         pWindowResInfo->prevSKey = w.skey;
       }
-      
-      if (pRuntimeEnv->pFillInfo != NULL) {
-        pRuntimeEnv->pFillInfo->start = w.skey;
-      }
     }
 
     // in case of prj/diff query, ensure the output buffer is sufficient to accommodate the results of current block
@@ -3894,7 +3890,6 @@ static void queryCostStatis(SQInfo *pQInfo) {
 //  double total = pSummary->fileTimeUs + pSummary->cacheTimeUs;
 //  double io = pSummary->loadCompInfoUs + pSummary->loadBlocksUs + pSummary->loadFieldUs;
   
-  // todo add the intermediate result save cost!!
 //  double computing = total - io;
 //
 //  qDebug(
@@ -4231,7 +4226,7 @@ int32_t doInitQInfo(SQInfo *pQInfo, STSBuf *pTsBuf, void *tsdb, int32_t vgId, bo
 
   if (pQuery->fillType != TSDB_FILL_NONE && !isPointInterpoQuery(pQuery)) {
     SFillColInfo* pColInfo = taosCreateFillColInfo(pQuery);
-    pRuntimeEnv->pFillInfo = taosInitFillInfo(pQuery->order.order, 0, 0, pQuery->rec.capacity, pQuery->numOfOutput,
+    pRuntimeEnv->pFillInfo = taosInitFillInfo(pQuery->order.order, pQuery->window.skey, 0, pQuery->rec.capacity, pQuery->numOfOutput,
                                               pQuery->slidingTime, pQuery->slidingTimeUnit, pQuery->precision,
                                               pQuery->fillType, pColInfo);
   }
diff --git a/src/query/src/qfill.c b/src/query/src/qfill.c
index eebe9a976b29535415130635676b309e9c05840c..65951a5b9e22786525d6b9f61672853f3be3d93d 100644
--- a/src/query/src/qfill.c
+++ b/src/query/src/qfill.c
@@ -174,7 +174,7 @@ int32_t taosNumOfRemainRows(SFillInfo* pFillInfo) {
     return 0;
   }
 
-  return FILL_IS_ASC_FILL(pFillInfo) ? (pFillInfo->numOfRows - pFillInfo->rowIdx) : pFillInfo->rowIdx + 1;
+  return pFillInfo->numOfRows - pFillInfo->rowIdx;
 }
 
 // todo: refactor
diff --git a/tests/script/general/parser/fill.sim b/tests/script/general/parser/fill.sim
index 4dfee222cc5ad106271890f5c16d4a42c1bf5ee8..488f807fbc710199fa7489cf67d010d3e12bcc9a 100644
--- a/tests/script/general/parser/fill.sim
+++ b/tests/script/general/parser/fill.sim
@@ -843,6 +843,14 @@ if $data81 != 4 then
   return -1
 endi
 
+# desc fill query
+print desc fill query
+sql select count(*) from m_fl_tb0 where ts>='2018-9-17 9:0:0' and ts<='2018-9-17 9:11:00' interval(1m) fill(value,10) order by ts desc;
+if $rows != 12 then
+  return -1
+endi
+
+
 print =============== clear
 sql drop database $db
 sql show databases