diff --git a/libs/surfaceflinger/LayerBase.cpp b/libs/surfaceflinger/LayerBase.cpp
index 5fa14b2..a841ab3 100644
--- a/libs/surfaceflinger/LayerBase.cpp
+++ b/libs/surfaceflinger/LayerBase.cpp
@@ -53,8 +53,6 @@
 
 // ---------------------------------------------------------------------------
 
-int32_t LayerBase::sIdentity = 0;
-
 LayerBase::LayerBase(SurfaceFlinger* flinger, DisplayID display)
     : dpy(display), contentDirty(false),
       mFlinger(flinger),
@@ -62,7 +60,6 @@
       mOrientation(0),
       mTransactionFlags(0),
       mPremultipliedAlpha(true),
-      mIdentity(uint32_t(android_atomic_inc(&sIdentity))),
       mInvalidate(0)
 {
     const DisplayHardware& hw(flinger->graphicPlane(0).displayHardware());
@@ -644,11 +641,14 @@
 
 // ---------------------------------------------------------------------------
 
+int32_t LayerBaseClient::sIdentity = 0;
+
 LayerBaseClient::LayerBaseClient(SurfaceFlinger* flinger, DisplayID display,
         const sp<Client>& client, int32_t i)
     : LayerBase(flinger, display), client(client),
       lcblk( client!=0 ? &(client->ctrlblk->layers[i]) : 0 ),
-      mIndex(i)
+      mIndex(i),
+      mIdentity(uint32_t(android_atomic_inc(&sIdentity)))
 {
 }
 
diff --git a/libs/surfaceflinger/LayerBase.h b/libs/surfaceflinger/LayerBase.h
index dad3d3d..6fb1d1c 100644
--- a/libs/surfaceflinger/LayerBase.h
+++ b/libs/surfaceflinger/LayerBase.h
@@ -277,9 +277,6 @@
                 // don't change, don't need a lock
                 bool            mPremultipliedAlpha;
 
-                // only read
-    const       uint32_t        mIdentity;
-     
                 // atomic
     volatile    int32_t         mInvalidate;
                 
@@ -290,7 +287,6 @@
 private:
     LayerBase(const LayerBase& rhs);
     void validateTexture(GLint textureName) const;
-    static int32_t sIdentity;
 };
 
 
@@ -360,6 +356,9 @@
                 int32_t         mIndex;
     mutable     Mutex           mLock;
     mutable     wp<Surface>     mClientSurface;
+    // only read
+    const       uint32_t        mIdentity;
+    static      int32_t         sIdentity;
 };
 
 // ---------------------------------------------------------------------------
diff --git a/libs/surfaceflinger/LayerBuffer.cpp b/libs/surfaceflinger/LayerBuffer.cpp
index 3db5434..22fd499 100644
--- a/libs/surfaceflinger/LayerBuffer.cpp
+++ b/libs/surfaceflinger/LayerBuffer.cpp
@@ -52,6 +52,7 @@
 
 void LayerBuffer::onFirstRef()
 {
+    LayerBaseClient::onFirstRef();
     mSurface = new SurfaceBuffer(mFlinger, clientIndex(),
             const_cast<LayerBuffer *>(this));
 }