diff --git a/lib/bufferreader.js b/lib/bufferreader.js
index 375ed3f..a356999 100644
--- a/lib/bufferreader.js
+++ b/lib/bufferreader.js
@@ -23,14 +23,15 @@ BufferReader.prototype.eof = function() {
 };
 
 BufferReader.prototype.buffer = function(len) {
-  var buf = this.buf.slice(this.pos, this.pos + len);
-  this.pos = this.pos + len;
-  return buf;
+  return this.read(len);
 };
 
 BufferReader.prototype.read = function(len) {
-  if (len)
-    return this.buffer(len);
+  if (len) {
+    var buf = this.buf.slice(this.pos, this.pos + len);
+    this.pos = this.pos + len;
+    return buf;
+  }
   var buf = this.buf.slice(this.pos);
   this.pos = this.buf.length;
   return buf;