diff --git a/websocket-sharp/WsStream.cs b/websocket-sharp/WsStream.cs
index 60d2dde6..4bbaaee9 100644
--- a/websocket-sharp/WsStream.cs
+++ b/websocket-sharp/WsStream.cs
@@ -111,10 +111,14 @@ namespace WebSocketSharp
     private static string [] readHandshakeHeaders (Stream stream)
     {
       var buffer = new List<byte> ();
-      Action<int> add = i => buffer.Add ((byte) i);
+      var count = 0;
+      Action<int> add = i => {
+        buffer.Add ((byte) i);
+        count++;
+      };
 
       var read = false;
-      while (buffer.Count < _handshakeHeadersLimitLen) {
+      while (count < _handshakeHeadersLimitLen) {
         if (stream.ReadByte ().EqualsWith ('\r', add) &&
             stream.ReadByte ().EqualsWith ('\n', add) &&
             stream.ReadByte ().EqualsWith ('\r', add) &&