diff --git a/zond/src/main/java/asys/zond/PipeInputStream.java b/zond/src/main/java/asys/zond/PipeInputStream.java
index ff44a07..f09bfdc 100644
--- a/zond/src/main/java/asys/zond/PipeInputStream.java
+++ b/zond/src/main/java/asys/zond/PipeInputStream.java
@@ -24,9 +24,12 @@ public class PipeInputStream extends InputStream {
             }
         }
 
-        if ((lastWritePos + strBytes.length) >= 1024) {
+        if ((lastWritePos + strBytes.length) >= buffer.length) {
             wallPos = lastWritePos;
             lastWritePos = 0;
+            if (lastReadPos == wallPos) {
+                lastReadPos = 0;
+            }
         }
 
         System.arraycopy(strBytes, 0, this.buffer, lastWritePos, strBytes.length);