diff --git a/src/Renci.SshNet.Tests/Classes/Common/PipeStreamTest.cs b/src/Renci.SshNet.Tests/Classes/Common/PipeStreamTest.cs
index 4c11b432a..2885d97ec 100644
--- a/src/Renci.SshNet.Tests/Classes/Common/PipeStreamTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Common/PipeStreamTest.cs
@@ -63,7 +63,7 @@ public void Read()
 
             var readBuffer = new byte[2];
             var bytesRead = target.Read(readBuffer, 0, readBuffer.Length);
-            Assert.AreEqual(2, bytesRead);
+            Assert.AreEqual(readBuffer.Length, bytesRead);
             Assert.AreEqual(0x0a, readBuffer[0]);
             Assert.AreEqual(0x0d, readBuffer[1]);
 
@@ -76,9 +76,20 @@ public void Read()
                     });
             writeToStreamThread.Start();
 
+            target.BlockLastReadBuffer = true;
             readBuffer = new byte[2];
-            bytesRead = target.Read(readBuffer, 0, readBuffer.Length);
-            Assert.AreEqual(2, bytesRead);
+            int bufferOffset = 0;
+            while (bufferOffset < readBuffer.Length)
+            {
+                bytesRead = target.Read(readBuffer, bufferOffset, readBuffer.Length -  bufferOffset);
+                if (bytesRead == 0)
+                {
+                    Assert.Fail("PipeStream.Read returned 0");
+                }
+
+                bufferOffset += bytesRead;
+            }
+            Assert.AreEqual(readBuffer.Length, bufferOffset);
             Assert.AreEqual(0x09, readBuffer[0]);
             Assert.AreEqual(0x05, readBuffer[1]);
         }
diff --git a/src/Renci.SshNet.Tests/Classes/Common/PipeStream_Close_BlockingRead.cs b/src/Renci.SshNet.Tests/Classes/Common/PipeStream_Close_BlockingRead.cs
index fb010c14f..7f78370f5 100644
--- a/src/Renci.SshNet.Tests/Classes/Common/PipeStream_Close_BlockingRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Common/PipeStream_Close_BlockingRead.cs
@@ -15,6 +15,7 @@ public class PipeStream_Close_BlockingRead : TripleATestBase
         protected override void Arrange()
         {
             _pipeStream = new PipeStream();
+            _pipeStream.BlockLastReadBuffer = true;
 
             _pipeStream.WriteByte(10);
             _pipeStream.WriteByte(13);
diff --git a/src/Renci.SshNet/Common/PipeStream.cs b/src/Renci.SshNet/Common/PipeStream.cs
index fac54fb62..f396d8f2f 100644
--- a/src/Renci.SshNet/Common/PipeStream.cs
+++ b/src/Renci.SshNet/Common/PipeStream.cs
@@ -42,12 +42,6 @@ public class PipeStream : Stream
         /// <remarks>Possible more effecient ways to accomplish this.</remarks>
         private readonly Queue<byte> _buffer = new Queue<byte>();
 
-        /// <summary>
-        /// Indicates that the input stream has been flushed and that
-        /// all remaining data should be written to the output stream.
-        /// </summary>
-        private bool _isFlushed;
-
         /// <summary>
         /// Maximum number of bytes to store in the buffer.
         /// </summary>
@@ -131,7 +125,6 @@ public override void Flush()
             if (_isDisposed)
                 throw CreateObjectDisposedException();
 
-            _isFlushed = true;
             lock (_buffer)
             {
                 // unblock read hereby allowing buffer to be partially filled
@@ -180,8 +173,6 @@ public override void SetLength(long value)
         ///<exception cref="ArgumentOutOfRangeException">offset or count is negative.</exception>
         public override int Read(byte[] buffer, int offset, int count)
         {
-            if (offset != 0)
-                throw new NotSupportedException("Offsets with value of non-zero are not supported");
             if (buffer == null)
                 throw new ArgumentNullException("buffer");
             if (offset + count > buffer.Length)
@@ -213,7 +204,7 @@ public override int Read(byte[] buffer, int offset, int count)
                 // fill the read buffer
                 for (; readLength < count && _buffer.Count > 0; readLength++)
                 {
-                    buffer[readLength] = _buffer.Dequeue();
+                    buffer[offset + readLength] = _buffer.Dequeue();
                 }
 
                 Monitor.Pulse(_buffer);
@@ -229,8 +220,7 @@ public override int Read(byte[] buffer, int offset, int count)
         /// <returns><c>True</c> if data available; otherwise<c>false</c>.</returns>
         private bool ReadAvailable(int count)
         {
-            var length = Length;
-            return (_isFlushed || length >= count) && (length >= (count + 1) || !BlockLastReadBuffer);
+            return BlockLastReadBuffer ? Length >= count : Length > 0;
         }
 
         ///<summary>
@@ -264,8 +254,6 @@ public override void Write(byte[] buffer, int offset, int count)
                 while (Length >= _maxBufferLength)
                     Monitor.Wait(_buffer);
 
-                _isFlushed = false; // if it were flushed before, it soon will not be.
-
                 // queue up the buffer data
                 for (var i = offset; i < offset + count; i++)
                 {