diff --git a/index.js b/index.js
index 715f62a..b1258be 100644
--- a/index.js
+++ b/index.js
@@ -181,10 +181,10 @@ function registerPipeline (options, pipeline) {
         if (pipeline.handlers.some(function (h) { return handler.routingKey !== h.routingKey; })) {
 
           if (bus[queueType][queueName].listening) {
-            bus[queueType][queueName].listenChannel.bindQueue(queueName, bus.exchangeName, handler.routingKey);
+            bus[queueType][queueName].listenChannel.bindQueue(queueName, bus[queueType][queueName].exchangeName, handler.routingKey);
           } else {
             bus[queueType][queueName].on('listening', function () {
-              bus[queueType][queueName].listenChannel.bindQueue(queueName, bus.exchangeName, handler.routingKey);
+              bus[queueType][queueName].listenChannel.bindQueue(queueName, bus[queueType][queueName].exchangeName, handler.routingKey);
             });
           }
 
diff --git a/package.json b/package.json
index b8dd7c3..8745bae 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "servicebus-register-handlers",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "module for registering all servicebus handlers in a folder, according to convention",
   "main": "index.js",
   "scripts": {