diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index ac909de..8426f09 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -795,6 +795,7 @@
         if (fMCStack.count() > 1) {
             this->willRestore();
             SkASSERT(fSaveCount > 1);
+            fSaveCount -= 1;
             this->internalRestore();
             this->didRestore();
         }
@@ -878,6 +879,7 @@
         bounds = NULL;
     }
     SaveLayerStrategy strategy = this->willSaveLayer(bounds, paint, kARGB_ClipLayer_SaveFlag);
+    fSaveCount += 1;
     this->internalSaveLayer(bounds, paint, kARGB_ClipLayer_SaveFlag, strategy);
     return this->getSaveCount() - 1;
 }
@@ -887,6 +889,7 @@
         bounds = NULL;
     }
     SaveLayerStrategy strategy = this->willSaveLayer(bounds, paint, flags);
+    fSaveCount += 1;
     this->internalSaveLayer(bounds, paint, flags, strategy);
     return this->getSaveCount() - 1;
 }
@@ -897,8 +900,6 @@
     flags |= kClipToLayer_SaveFlag;
 #endif
 
-    fSaveCount += 1;
-
     // do this before we create the layer. We don't call the public save() since
     // that would invoke a possibly overridden virtual
     this->internalSave();
@@ -977,8 +978,6 @@
 void SkCanvas::internalRestore() {
     SkASSERT(fMCStack.count() != 0);
 
-    fSaveCount -= 1;
-
     fDeviceCMDirty = true;
     fCachedLocalClipBoundsDirty = true;