diff --git a/lib/inflate.js b/lib/inflate.js
index a9dfeb5..a081ea8 100644
--- a/lib/inflate.js
+++ b/lib/inflate.js
@@ -214,7 +214,7 @@ Inflate.prototype.push = function(data, mode) {
     if (strm.next_out_index) {
       if (strm.avail_out === 0 || status === c.Z_STREAM_END || (strm.avail_in === 0 && _mode === c.Z_FINISH)) {
 
-        if (this.to === 'string') {
+        /*if (this.options.to === 'string') {
 
           // realign size to utf8 char border & move tail to start of buffer
           next_out_utf8_index = strm.next_out_index - 5;
@@ -243,7 +243,8 @@ Inflate.prototype.push = function(data, mode) {
 
         } else {
           this.onData(utils.shrinkBuf(strm.next_out, strm.next_out_index));
-        }
+        }*/
+        this.onData(utils.shrinkBuf(strm.next_out, strm.next_out_index));
       }
     }
   } while ((strm.avail_in > 0 || strm.avail_out === 0) && status !== c.Z_STREAM_END);
@@ -292,7 +293,8 @@ Inflate.prototype.onEnd = function(status) {
     if (this.options.to === 'string') {
       // Glue & convert here, until we teach pako to send
       // utf8 alligned strings to onData
-      this.result = this.chunks.join('');
+      //this.result = this.chunks.join('');
+      this.result = strings.buf2string(utils.flattenChunks(this.chunks));
     } else {
       this.result = utils.flattenChunks(this.chunks);
     }
diff --git a/test/strings.js b/test/strings.js
index 77908f6..ab99a54 100644
--- a/test/strings.js
+++ b/test/strings.js
@@ -29,10 +29,10 @@ describe('Deflate strings', function () {
   });
 
   it('Deflate with binary string output', function () {
-    assert.ok(cmp(
-      new Buffer(pako.deflate(sampleArray, { to: 'string', chunkSize: 99 }), 'binary'),
-      pako.deflate(sampleArray)
-    ));
+    var data = pako.deflate(sampleArray, { to: 'string', chunkSize: 99 });
+
+    assert.equal(typeof data, 'string');
+    assert.ok(cmp(new Buffer(data, 'binary'), pako.deflate(sampleArray)));
   });
 
 });
@@ -43,17 +43,14 @@ describe('Inflate strings', function () {
   var deflatedArray  = pako.deflate(sampleArray);
 
   it('Inflate binary string input', function () {
-    assert.ok(cmp(
-      pako.inflate(deflatedString),
-      pako.inflate(deflatedArray)
-    ));
+    assert.ok(cmp(pako.inflate(deflatedString), pako.inflate(deflatedArray)));
   });
 
   it('Inflate with javascript string (utf16) output', function () {
-    assert.ok(
-      pako.inflate(deflatedArray, { to: 'string', chunkSize: 99 }),
-      sampleString
-    );
+    var data = pako.inflate(deflatedArray, { to: 'string', chunkSize: 99 });
+
+    assert.equal(typeof data, 'string');
+    assert.equal(data, sampleString);
   });
 
 });