Index: src/where.c
==================================================================
--- src/where.c
+++ src/where.c
@@ -4845,11 +4845,10 @@
   sqlite3ExprCacheClear(pParse);
   for(i=pWInfo->nLevel-1; i>=0; i--){
     int addr;
     pLevel = &pWInfo->a[i];
     pLoop = pLevel->pWLoop;
-    sqlite3VdbeResolveLabel(v, pLevel->addrCont);
     if( pLevel->op!=OP_Noop ){
 #ifndef SQLITE_DISABLE_SKIPAHEAD_DISTINCT
       int n = -1;
       int j, k, op;
       int r1 = pParse->nMem+1;
@@ -4865,22 +4864,29 @@
         ** using OP_Next/OP_Prev. */
         ExprList *pX = pWInfo->pResultSet;
         for(j=0; j<pX->nExpr; j++){
           Expr *pE = sqlite3ExprSkipCollate(pX->a[j].pExpr);
           if( pE->op==TK_COLUMN ){
-            if( pE->iTable!=pLevel->iTabCur ) continue;
-            k = 1+sqlite3ColumnOfIndex(pIdx, pE->iColumn);
+            if( pE->iTable==pLevel->iIdxCur ){
+              k = pE->iColumn+1;
+            }else{
+              if( pE->iTable!=pLevel->iTabCur ) continue;
+              k = 1+sqlite3ColumnOfIndex(pIdx, pE->iColumn);
+            }
             if( k>n ) n = k;
-          }else if( pIdx->aColExpr ){
-            for(k=n+1; k<pIdx->nKeyCol; k++){
+          }
+#ifdef SQLITE_DEBUG
+          /* Any expressions in the result-set that match columns of the
+          ** index should have already been transformed to TK_COLUMN 
+          ** operations by whereIndexExprTrans().  */
+          else if( pIdx->aColExpr ){
+            for(k=0; k<pIdx->nKeyCol; k++){
               Expr *pI = pIdx->aColExpr->a[k].pExpr;
-              if( pI && sqlite3ExprCompare(pE,pI,0)<2 ){
-                n = k+1;
-                break;
-              }
+              assert( pI==0 || sqlite3ExprCompare(pE, pI, pE->iTable)!=0 );
             }
           }
+#endif
         }
       }
       /* TUNING: Only try to skip ahead using OP_Seek if we expect to
       ** skip over 11 or more rows.  Otherwise, OP_Next is just as fast.
       */
@@ -4893,22 +4899,27 @@
         op = pLevel->op==OP_Prev ? OP_SeekLT : OP_SeekGT;
         k = sqlite3VdbeAddOp4Int(v, op, pLevel->iIdxCur, 0, r1, n);
         VdbeCoverageIf(v, op==OP_SeekLT);
         VdbeCoverageIf(v, op==OP_SeekGT);
         sqlite3VdbeAddOp2(v, OP_Goto, 1, pLevel->p2);
+        sqlite3VdbeResolveLabel(v, pLevel->addrCont);
+        sqlite3VdbeAddOp3(v, pLevel->op, pLevel->p1, pLevel->p2, pLevel->p3);
         sqlite3VdbeJumpHere(v, k);
       }else
 #endif /* SQLITE_DISABLE_SKIPAHEAD_DISTINCT */
       {
         /* The common case: Advance to the next row */
+        sqlite3VdbeResolveLabel(v, pLevel->addrCont);
         sqlite3VdbeAddOp3(v, pLevel->op, pLevel->p1, pLevel->p2, pLevel->p3);
         sqlite3VdbeChangeP5(v, pLevel->p5);
         VdbeCoverage(v);
         VdbeCoverageIf(v, pLevel->op==OP_Next);
         VdbeCoverageIf(v, pLevel->op==OP_Prev);
         VdbeCoverageIf(v, pLevel->op==OP_VNext);
       }
+    }else{
+      sqlite3VdbeResolveLabel(v, pLevel->addrCont);
     }
     if( pLoop->wsFlags & WHERE_IN_ABLE && pLevel->u.in.nIn>0 ){
       struct InLoop *pIn;
       int j;
       sqlite3VdbeResolveLabel(v, pLevel->addrNxt);

Index: test/distinct2.test
==================================================================
--- test/distinct2.test
+++ test/distinct2.test
@@ -82,7 +82,63 @@
   INSERT INTO t6a VALUES(1);
   CREATE TABLE t6b(y INTEGER PRIMARY KEY);
   INSERT INTO t6b VALUES(2),(3);
   SELECT DISTINCT x, x FROM t6a, t6b;
 } {1 1}
+
+do_execsql_test 700 {
+  CREATE TABLE t7(a, b, c);
+  WITH s(i) AS (
+    SELECT 1 UNION ALL SELECT i+1 FROM s WHERE (i+1)<200
+  )
+  INSERT INTO t7 SELECT i/100, i/50, i FROM s;
+}
+do_execsql_test 710 {
+  SELECT DISTINCT a, b FROM t7;
+} {
+  0 0    0 1
+  1 2    1 3
+}
+do_execsql_test 720 {
+  SELECT DISTINCT a, b+1 FROM t7;
+} {
+  0 1    0 2
+  1 3    1 4
+}
+do_execsql_test 730 {
+  CREATE INDEX i7 ON t7(a, b+1);
+  ANALYZE;
+  SELECT DISTINCT a, b+1 FROM t7;
+} {
+  0 1    0 2
+  1 3    1 4
+}
+
+do_execsql_test 800 {
+  CREATE TABLE t8(a, b, c);
+  WITH s(i) AS (
+    SELECT 1 UNION ALL SELECT i+1 FROM s WHERE (i+1)<100
+  )
+  INSERT INTO t8 SELECT i/40, i/20, i/40 FROM s;
+}
+
+do_execsql_test 820 {
+  SELECT DISTINCT a, b, c FROM t8;
+} {
+  0 0 0    0 1 0
+  1 2 1    1 3 1
+  2 4 2
+}
+
+do_execsql_test 820 {
+  SELECT DISTINCT a, b, c FROM t8 WHERE b=3;
+} {1 3 1}
+
+do_execsql_test 830 {
+  CREATE INDEX i8 ON t8(a, c);
+  ANALYZE;
+  SELECT DISTINCT a, b, c FROM t8 WHERE b=3;
+} {1 3 1}
+
 
 finish_test
+