diff --git a/README.chromium b/README.chromium
index febf0eca5..3e6209bfb 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 95
+Version: 96
 License: BSD
 License File: LICENSE
 
diff --git a/source/planar_functions.cc b/source/planar_functions.cc
index 91f5bf788..9ef3890da 100644
--- a/source/planar_functions.cc
+++ b/source/planar_functions.cc
@@ -150,13 +150,14 @@ void CopyRow_SSE2(const uint8* src, uint8* dst, int count) {
   }
 }
 
+__declspec(naked)
 void CopyRow_X86(const uint8* src, uint8* dst, int count) {
   __asm {
     push       esi
     push       edi
-    mov        esi, [esp + 4 + 4]   // src
-    mov        edi, [esp + 4 + 8]   // dst
-    mov        ecx, [esp + 4 + 12]  // count
+    mov        esi, [esp + 8 + 4]   // src
+    mov        edi, [esp + 8 + 8]   // dst
+    mov        ecx, [esp + 8 + 12]  // count
     shr        ecx, 2
     rep movsd
     pop        edi
@@ -257,7 +258,6 @@ int I420Copy(const uint8* src_y, int src_stride_y,
   return 0;
 }
 
-
 // Copy ARGB with optional flipping
 int ARGBCopy(const uint8* src_argb, int src_stride_argb,
              uint8* dst_argb, int dst_stride_argb,