diff --git a/zigate/core.py b/zigate/core.py
index 87a79b37..704a037b 100644
--- a/zigate/core.py
+++ b/zigate/core.py
@@ -728,10 +728,9 @@ def remove_device(self, addr):
         ''' remove device '''
         if addr in self._devices:
             ieee = self._devices[addr]['ieee']
-#             addr = self.__addr(addr)
             ieee = self.__addr(ieee)
-#             data = struct.pack('!HQ', addr, ieee)
-            data = struct.pack('!QQ', ieee, ieee)
+            zigate_ieee = self.__addr(self.ieee)
+            data = struct.pack('!QQ', zigate_ieee, ieee)
             return self.send_data(0x0026, data)
 
     def _bind_unbind(self, cmd, ieee, endpoint, cluster,
diff --git a/zigate/version.py b/zigate/version.py
index 533e66a9..c1a18b7d 100644
--- a/zigate/version.py
+++ b/zigate/version.py
@@ -5,4 +5,4 @@
 # file that was distributed with this source code.
 #
 
-__version__ = '0.22.0dev'
+__version__ = '0.21.1'