diff --git a/tunnels/adapters/connector/tcp/tcp_connector.c b/tunnels/adapters/connector/tcp/tcp_connector.c
index ac8e0028..5a21fd4f 100644
--- a/tunnels/adapters/connector/tcp/tcp_connector.c
+++ b/tunnels/adapters/connector/tcp/tcp_connector.c
@@ -280,8 +280,8 @@ static void upStream(tunnel_t *self, context_t *c)
         }
         else if (c->fin)
         {
-            CSTATE_MUT(c) = NULL;
             cleanup(cstate, true);
+            CSTATE_MUT(c) = NULL;
             destroyContext(c);
         }
     }
diff --git a/tunnels/adapters/connector/tcp/tcp_connector.h b/tunnels/adapters/connector/tcp/tcp_connector.h
index 62211c5b..424411e0 100644
--- a/tunnels/adapters/connector/tcp/tcp_connector.h
+++ b/tunnels/adapters/connector/tcp/tcp_connector.h
@@ -4,7 +4,7 @@
 // con <-----\                    /----->  Resolve=>  TCP Connect
 // con <------>   TcpConnector   <------>  Resolve=>  TCP Connect
 // con <-----/                    \----->  Resolve=>  TCP Connect
-//
+
 
 tunnel_t *        newTcpConnector(node_instance_context_t *instance_info);
 api_result_t      apiTcpConnector(tunnel_t *self, const char *msg);