diff --git a/coolamqp/uplink/handshake.py b/coolamqp/uplink/handshake.py
index 8544cdbc290cb887cbc838ee94d73ad2fe926cfb..00f55745d18c139cfca7be8ba9c1b0928f314367 100644
--- a/coolamqp/uplink/handshake.py
+++ b/coolamqp/uplink/handshake.py
@@ -22,7 +22,7 @@ CLIENT_DATA = [
         # because RabbitMQ is some kind of a fascist and does not allow
         # these fields to be of type short-string
         (b'product', (b'CoolAMQP', 'S')),
-        (b'version', (b'0.85', 'S')),
+        (b'version', (b'0.86', 'S')),
         (b'copyright', (b'Copyright (C) 2016-2017 DMS Serwis', 'S')),
         (b'information', (b'Licensed under the MIT License.\nSee https://github.com/smok-serwis/coolamqp for details', 'S')),
         (b'capabilities', ([(capa, (True, 't')) for capa in SUPPORTED_EXTENSIONS], 'F')),
diff --git a/coolamqp/uplink/listener/epoll_listener.py b/coolamqp/uplink/listener/epoll_listener.py
index 16e8926b1056b905cb40196b8289d83c0b1354df..692b2aa455c9c8eebd1bc3fdaa7dbb00ceb148ea 100644
--- a/coolamqp/uplink/listener/epoll_listener.py
+++ b/coolamqp/uplink/listener/epoll_listener.py
@@ -87,9 +87,9 @@ class EpollListener(object):
 
                 if event & select.EPOLLOUT:
 
-                    if sock.on_write():
-                        # I'm done with sending for now
-                        assert len(sock.data_to_send) == 0 and len(sock.priority_queue) == 0
+                    sock.on_write()
+                    # I'm done with sending for now
+                    if len(sock.data_to_send) == 0 and len(sock.priority_queue) == 0:
                         self.epoll.modify(sock.fileno(), RO)
 
             except SocketFailed:
diff --git a/setup.py b/setup.py
index b2c3afb086b3562ba563fa54109c389b55b7146d..cc670f21f893c5853c4e1b20096942666d15f8d5 100644
--- a/setup.py
+++ b/setup.py
@@ -4,12 +4,12 @@ from setuptools import setup
 
 
 setup(name=u'CoolAMQP',
-      version='0.85',
+      version='0.86',
       description=u'The fastest AMQP client',
       author=u'DMS Serwis s.c.',
       author_email=u'piotrm@smok.co',
       url=u'https://github.com/smok-serwis/coolamqp',
-      download_url='https://github.com/smok-serwis/coolamqp/archive/v0.85.zip',
+      download_url='https://github.com/smok-serwis/coolamqp/archive/v0.86.zip',
       keywords=['amqp', 'rabbitmq', 'client', 'network', 'ha', 'high availability'],
       packages=[
           'coolamqp',