--- tcp-socket-base.cc	2013-12-24 11:02:02.777010134 -0500
+++ mod-tcp-socket-base.cc	2013-12-24 11:12:28.337034468 -0500
@@ -770,10 +770,7 @@
     {
       NotifyNormalClose ();
     }
-  if (m_state != TIME_WAIT)
-    {
-      DeallocateEndPoint ();
-    }
+  DeallocateEndPoint ();
   m_closeNotified = true;
   NS_LOG_INFO (TcpStateName[m_state] << " -> CLOSED");
   CancelAllTimers ();