diff --git a/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultAsyncClientConnection.java b/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultAsyncClientConnection.java
index df3d931a..1ceb694b 100644
--- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultAsyncClientConnection.java
+++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultAsyncClientConnection.java
@@ -54,6 +54,7 @@ public class DefaultAsyncClientConnection
     private final Log log;
 
     private String id;
+    private IOSession original;
 
     public DefaultAsyncClientConnection(
             final String id,
@@ -63,25 +64,25 @@ public DefaultAsyncClientConnection(
             final HttpParams params) {
         super(iosession, responseFactory, allocator, params);
         this.id = id;
+        this.original = iosession;
         this.log = LogFactory.getLog(iosession.getClass());
         if (this.log.isDebugEnabled() || this.wirelog.isDebugEnabled()) {
-            this.session = new LoggingIOSession(iosession, this.id, this.log, this.wirelog);
+            bind(new LoggingIOSession(iosession, this.id, this.log, this.wirelog));
         }
     }
 
     public void upgrade(final IOSession iosession) {
-        this.session.setBufferStatus(null);
+        this.original = iosession;
         if (this.log.isDebugEnabled() || this.wirelog.isDebugEnabled()) {
             this.log.debug(this.id + " Upgrade session " + iosession);
-            this.session = new LoggingIOSession(iosession, this.id, this.headerlog, this.wirelog);
+            bind(new LoggingIOSession(iosession, this.id, this.headerlog, this.wirelog));
         } else {
-            this.session = iosession;
+            bind(iosession);
         }
-        this.session.setBufferStatus(this);
     }
 
     public IOSession getIOSession() {
-        return this.session;
+        return this.original;
     }
 
     @Override
diff --git a/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedAsyncClientConnectionImpl.java b/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedAsyncClientConnectionImpl.java
index 8c14e65c..4058cf73 100644
--- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedAsyncClientConnectionImpl.java
+++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedAsyncClientConnectionImpl.java
@@ -62,7 +62,7 @@ class ManagedAsyncClientConnectionImpl implements ManagedAsyncClientConnection {
     private volatile boolean reusable;
     private volatile long duration;
 
-    public ManagedAsyncClientConnectionImpl(
+    ManagedAsyncClientConnectionImpl(
             final ClientAsyncConnectionManager manager,
             final HttpPoolEntry poolEntry) {
         super();
@@ -296,7 +296,8 @@ protected HttpResponseFactory createHttpResponseFactory() {
 
     public synchronized void open(
             final HttpRoute route,
-            final HttpContext context, final HttpParams params) throws IOException {
+            final HttpContext context, 
+            final HttpParams params) throws IOException {
         HttpPoolEntry entry = ensurePoolEntry();
         RouteTracker tracker = entry.getTracker();
         if (tracker.isConnected()) {