diff --git a/m2mclient/_version.py b/m2mclient/_version.py
index 54aa06f..a7c8c10 100644
--- a/m2mclient/_version.py
+++ b/m2mclient/_version.py
@@ -1,3 +1,3 @@
 from __future__ import unicode_literals
 
-VERSION = "0.1.6"
+VERSION = "0.1.7a"
diff --git a/m2mclient/client.py b/m2mclient/client.py
index 14d8597..373e9ab 100644
--- a/m2mclient/client.py
+++ b/m2mclient/client.py
@@ -158,12 +158,8 @@ def __enter__(self):
 
     def __exit__(self, exc_type, exc_val, exc_tb):
         try:
-            # Ask politely to leave
+            # Close the websocket
             self.close()
-            # Wait until we're done
-            if not self.ws.join(1):
-                # Force a close if we didn't complete
-                self.ws.close()
         finally:
             self.ws = None
             self.dispatcher.close()
@@ -193,7 +189,7 @@ def close(self):
         """A graceful close."""
         # If everything is working, the server will kick us in a few
         # milliseconds.
-        self.send('request_leave')
+        self.ws.close()
 
     def send(self, packet_type, *args, **kwargs):
         """Send a packet."""