@@ -119,35 +119,17 @@
 // and decompresses data according to the predictor algorithm
 func Decompressor(reader io.Reader) io.Reader {
 	var ctx context
 	ctx.input = make([]byte, 0, 8)
 
-	return iou.ReaderFunc(func(output []byte) (int, error) {
+	return iou.BlockReader(iou.ReaderFunc(func(output []byte) (int, error) {
 		var (
 			err               error
 			flags, predicted  byte
 			rc, total, copied int
 		)
 
-		// Sanity check for space to read into
-		if len(output) == 0 {
-			return 0, nil
-		}
-
-		// Check whether we have leftover data in the buffer
-		if len(ctx.input) > 0 {
-			rc = copy(output, ctx.input)
-
-			// Check whether we still have leftover data in the buffer :)
-			if rc < len(ctx.input) {
-				// Shift the remaining bytes at the start of the buffer
-				//  and resize the buffer accordingly
-				ctx.input = ctx.input[:copy(ctx.input, ctx.input[rc:])]
-			}
-			return rc, nil
-		}
-
 		// Read the next prediction header
 	readHeader:
 		rc, err = reader.Read(ctx.input[:1])
 		// Fail on error unless it is EOF
 		if err != nil && err != io.EOF {
@@ -194,24 +176,17 @@
 
 		// Copy the decompressed data to the output and accumulate the count
 		copied = copy(output, ctx.input[:rc])
 		total += copied
 
-		// Check for remaining bytes that dont fit in the output buffer
-		if copied < rc {
-			// Shift the remaining bytes at the start of the buffer
-			//  and resize the buffer accordingly
-			ctx.input = ctx.input[:copy(ctx.input, ctx.input[copied:rc])]
-		} else {
-			// Clear the buffer
-			ctx.input = ctx.input[:0]
-
-			// Loop for another pass if there is available space in the output
-			output = output[copied:]
-			if len(output) > 0 && err == nil {
-				goto readHeader
-			}
+		// Clear the buffer
+		ctx.input = ctx.input[:0]
+
+		// Loop for another pass if there is available space in the output
+		output = output[copied:]
+		if len(output) > 0 && err == nil {
+			goto readHeader
 		}
 
 		return total, err
-	})
+	}), 8)
 }