diff --git a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyFrameDecoder.java b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyFrameDecoder.java
index 4e56fb012b..3221566c2f 100644
--- a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyFrameDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyFrameDecoder.java
@@ -594,7 +594,7 @@ public class SpdyFrameDecoder extends FrameDecoder {
             }
         }
 
-        while (numHeaders -- > 0) {
+        while (numHeaders > 0) {
             int headerSize = this.headerSize;
             decompressed.markReaderIndex();
 
@@ -654,6 +654,7 @@ public class SpdyFrameDecoder extends FrameDecoder {
                     return;
                 } else {
                     spdyHeaderBlock.addHeader(name, "");
+                    numHeaders --;
                     this.headerSize = headerSize;
                     continue;
                 }
@@ -699,6 +700,7 @@ public class SpdyFrameDecoder extends FrameDecoder {
                 index ++;
                 offset = index;
             }
+            numHeaders --;
             this.headerSize = headerSize;
         }
         decompressed = null;