--- a/src/internet/model/tcp-socket-base.cc	Thu May 01 15:18:41 2014 +0200
+++ b/src/internet/model/tcp-socket-base.cc	Thu May 01 16:49:11 2014 -0400
@@ -782,7 +782,11 @@
       NotifyNormalClose ();
     }
 
-  DeallocateEndPoint ();
+  if (m_state != TIME_WAIT)
+    {
+      DeallocateEndPoint ();
+    }
+    
   m_closeNotified = true;
   NS_LOG_INFO (TcpStateName[m_state] << " -> CLOSED");
   CancelAllTimers ();