diff --git a/vp8/encoder/quantize.c b/vp8/encoder/quantize.c
index b14f8c4cc657870144caeec5e691790def6243c4..3d1c2ff35dd0a400e3c0b52cf21e81dcc20e7156 100644
--- a/vp8/encoder/quantize.c
+++ b/vp8/encoder/quantize.c
@@ -609,8 +609,10 @@ void vp8_regular_quantize_b_8x8(BLOCK *b, BLOCKD *d)
 
     //zbin = (zbin_ptr[rc!=0] + *zbin_boost_ptr + zbin_oq_value)/q1st;
     zbin = (zbin_ptr[rc!=0] + *zbin_boost_ptr + zbin_oq_value);
+    //TODO: 8x8 zbin boost needs be done properly
+    if(zbin_boost_ptr < &b->zrun_zbin_boost[15])
+        zbin_boost_ptr ++;
 
-    zbin_boost_ptr ++;
     sz = (z >> 31);                                 // sign of z
     x  = (z ^ sz) - sz;                             // x = abs(z)
 
@@ -693,7 +695,6 @@ void vp8_strict_quantize_b_2x2(BLOCK *b, BLOCKD *d)
         eob = i;
     }
   }
-
   d->eob = eob + 1;
 }