diff --git a/websocket-sharp/Net/Chunk.cs b/websocket-sharp/Net/Chunk.cs
index 73573dbf..efa165c9 100644
--- a/websocket-sharp/Net/Chunk.cs
+++ b/websocket-sharp/Net/Chunk.cs
@@ -61,15 +61,9 @@ namespace WebSocketSharp.Net
 
     #region Public Properties
 
-    public int Length {
+    public int ReadLeft {
       get {
-        return _data.Length;
-      }
-    }
-
-    public int Offset {
-      get {
-        return _offset;
+        return _data.Length - _offset;
       }
     }
 
diff --git a/websocket-sharp/Net/ChunkStream.cs b/websocket-sharp/Net/ChunkStream.cs
index 68c3a830..0d521ed8 100644
--- a/websocket-sharp/Net/ChunkStream.cs
+++ b/websocket-sharp/Net/ChunkStream.cs
@@ -134,7 +134,7 @@ namespace WebSocketSharp.Net
         if (chunk == null)
           continue;
 
-        if (chunk.Offset == chunk.Length) {
+        if (chunk.ReadLeft == 0) {
           _chunks [i] = null;
           continue;
         }