diff --git a/manifest b/manifest
index 18808213b8..49b8701b26 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\soptimization\son\sclearCell()
-D 2017-08-02T18:27:50.018
+C Only\sattempt\sto\sinvoke\sWAL\scallbacks\swhen\sa\stransaction\shas\scommitted.
+D 2017-08-02T18:28:26.315
 F Makefile.in d9873c9925917cca9990ee24be17eb9613a668012c85a343aef7e5536ae266e8
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 02b469e9dcd5b7ee63fc1fb05babc174260ee4cfa4e0ef2e48c3c6801567a016
@@ -523,7 +523,7 @@ F src/vacuum.c 90839322fd5f00df9617eb21b68beda9b6e2a2937576b0d65985e4aeb1c53739
 F src/vdbe.c 5752a157cfb2898d154ecdd4a805135d2e9b1708084a3205dbc379af3ae8ef07
 F src/vdbe.h d50cadf12bcf9fb99117ef392ce1ea283aa429270481426b6e8b0280c101fd97
 F src/vdbeInt.h ff2b7db0968d20e6184aee256d2e535d565f5a172e3588a78adb166a41fc4911
-F src/vdbeapi.c 0823531191f9d5588a245ed5b39306798681814e9e8099d54a3213a13a28fbe7
+F src/vdbeapi.c 6e27a510b90fda08fd57aa55157f4a8c9df5916f4f200e5730636f2fe9f7d957
 F src/vdbeaux.c 5feca7a5f38a0bd154d8f68710e3afffdb9a83d7b56350497fdd316eb1dd6775
 F src/vdbeblob.c db3cf91060f6f4b2f1358a4200e844697990752177784c7c95da00b7ac9f1c7b
 F src/vdbemem.c 9ca2854976f35db40341977e688a08204c96427505f5b90215dc7970f6ea42c4
@@ -1640,7 +1640,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 49ba54e26731ed371745d4bdd9dd1dfeb73357b6d206c85a4252ec866be971d0
-R 62a1e1fe30ddd4bb4ee9fd2e389b71b0
+P f3c39c2986be08683c2af4df610bc12e3c6bc6bec265c94ce01b94a950723524
+R 65e3cc8741593ad1ca5069325bf0f8ba
 U drh
-Z 0b17768b93c7260b6ff17df2e5dd520c
+Z de8423cf21d34bd26fb77342a7fad01e
diff --git a/manifest.uuid b/manifest.uuid
index fb2c9e2ba6..67649f2da5 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f3c39c2986be08683c2af4df610bc12e3c6bc6bec265c94ce01b94a950723524
\ No newline at end of file
+bcc6dacb9114df709ef1bde24264c2193d9e39fc7fab024d5ebfc6056033274c
\ No newline at end of file
diff --git a/src/vdbeapi.c b/src/vdbeapi.c
index 24545e4f12..5fdbac48ed 100644
--- a/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@ -523,7 +523,7 @@ static int doWalCallbacks(sqlite3 *db){
       sqlite3BtreeEnter(pBt);
       nEntry = sqlite3PagerWalCallback(sqlite3BtreePager(pBt));
       sqlite3BtreeLeave(pBt);
-      if( db->xWalCallback && nEntry>0 && rc==SQLITE_OK ){
+      if( nEntry>0 && db->xWalCallback && rc==SQLITE_OK ){
         rc = db->xWalCallback(db->pWalArg, db, db->aDb[i].zDbSName, nEntry);
       }
     }
@@ -633,7 +633,7 @@ static int sqlite3Step(Vdbe *p){
   if( rc!=SQLITE_ROW ) checkProfileCallback(db, p);
 #endif
 
-  if( rc==SQLITE_DONE ){
+  if( rc==SQLITE_DONE && db->autoCommit ){
     assert( p->rc==SQLITE_OK );
     p->rc = doWalCallbacks(db);
     if( p->rc!=SQLITE_OK ){