2 files changed, 12 insertions, 2 deletions

diff --git a/eventmq/router.py b/eventmq/router.py
index 7c221bc..c35e88c 100644
--- a/eventmq/router.py
+++ b/eventmq/router.py
@@ -502,7 +502,7 @@ class Router(HeartbeatMixin):
             else:
                 self.processed_message_counts[queue_name] += 1
 
-            if queue_name not in self.processed_message_counts_by_worker:
+            if worker_addr not in self.processed_message_counts_by_worker:
                 self.processed_message_counts_by_worker[worker_addr] = 1
             else:
                 self.processed_message_counts_by_worker[worker_addr] += 1
diff --git a/eventmq/utils/classes.py b/eventmq/utils/classes.py
index 73c6364..1148da3 100644
--- a/eventmq/utils/classes.py
+++ b/eventmq/utils/classes.py
@@ -20,6 +20,7 @@ Defines some classes to use when implementing ZMQ devices
 from collections import deque
 import json
 import logging
+import sys
 
 import zmq.error
 
@@ -344,7 +345,11 @@ class ZMQReceiveMixin(object):
         """
         Receive a message
         """
-        msg = self.zsocket.recv()
+        if sys.version[0] == '2':
+            msg = self.zsocket.recv()
+        else:
+            msg = self.zsocket.recv_string()
+
         if not ("HEARTBEAT" == msg[2] or "HEARTBEAT" == msg[3]) or \
                 not conf.HIDE_HEARTBEAT_LOGS:
             logger.debug('Received message: {}'.format(msg))
@@ -355,6 +360,11 @@ class ZMQReceiveMixin(object):
         Receive a multipart message
         """
         msg = self.zsocket.recv_multipart()
+
+        # Decode bytes to strings in python3
+        if type(msg[0] in (bytes,)):
+            msg = [m.decode() for m in msg]
+
         # If it's not at least 4 frames long then most likely it isn't an
         # eventmq message
         if len(msg) >= 4 and \