diff --git a/lib/Client.js b/lib/Client.js
index 6268eea..4f9e3ff 100644
--- a/lib/Client.js
+++ b/lib/Client.js
@@ -147,9 +147,9 @@ module.exports = std.Class(Connection, function(supr) {
         // send queued send requests
         // make a copy because socket writes may return immediately and modify the size
         var r = this._sendRequests.slice(0);
-        for (i in r) this._writeRequest(r[i])
+        for (var i=0; i<r.length; i++) this._writeRequest(r[i])
         // send queued read requests
-        for (i in this._requests) this._writeRequest(this._requests[i])
+        for (var i=0; i<this._requests.length; i++) this._writeRequest(this._requests[i])
     }
 
     this._pushSendRequest = function(requestObj) {
diff --git a/lib/Consumer.js b/lib/Consumer.js
index 4a3223d..78c9d77 100644
--- a/lib/Consumer.js
+++ b/lib/Consumer.js
@@ -41,7 +41,7 @@ module.exports = std.Class(Client, function(supr) {
     }
 
     this.unsubscribeTopic = function(name) {
-        for (i in this._topics) if (this._topics[i].name == name) {
+        for (var i=0; i<this._topics.length; i++) if (this._topics[i].name == name) {
             this._topics.splice(i, 1)
             break
         }
@@ -80,14 +80,14 @@ module.exports = std.Class(Client, function(supr) {
         if (this._outstanding > 0 || !this._timerTicked) return
         
         this._timerTicked = false
-        for (i in this._topics) {
+        for (var i=0; i<this._topics.length; i++) {
             this._outstanding++
             this.fetchTopic(this._topics[i])
         }
     }
 
     this._processMessage = function(topic, message, offset) {
-        for (i in this._topics) if (this._topics[i].name == topic) {
+        for (var i=0; i<this._topics.length; i++) if (this._topics[i].name == topic) {
             this.emit('debug', "_processMessage is setting new offset for topic:" + topic + " offset: " + offset)
             this._topics[i].offset = offset
             break
@@ -96,7 +96,7 @@ module.exports = std.Class(Client, function(supr) {
     
     this._processLast = function(topic, offset, errno, error) {
         if (false && Math.random()*100 > 90) {
-            for (i in this._topics) if (this._topics[i].name == topic) {
+            for (var i=0; i<this._topics.length; i++) if (this._topics[i].name == topic) {
                 console.log("INJECTING ERRONEOUS OFFSET TO TOPIC: " + topic + " OFFSET: " + (offset-1000))
                 this._topics[i].offset = offset - 1000
                 break
diff --git a/package.json b/package.json
index 47e202b..c25cb87 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
-  "name": "kafka",
-  "description": "A node client for Kafka",
-  "version": "0.1.7",
-  "homepage": "https://github.com/marcuswestin/node-kafka",
+  "name": "kafka-fork",
+  "description": "A node client for Kafka. My fork with a fix for #5, since I couldn't wait for pull request for too long",
+  "version": "0.1.8",
+  "homepage": "https://github.com/yankov/node-kafka",
   "author": "Marcus Westin <narcvs@gmail.com> (http://marcuswest.in)",
   "repository": {
     "type": "git",