diff --git a/server.go b/server.go
index ddade69..5a6ad5a 100644
--- a/server.go
+++ b/server.go
@@ -260,13 +260,14 @@ func(server *Server) listen_udp() {
           continue
         }
 
-        client_addr, err := ParseSessionConnect(buf[COMMAND_LENGTH+ID_LENGTH:read], session.secret)
+        _, err := ParseSessionConnect(buf[COMMAND_LENGTH+ID_LENGTH:read], session.secret)
         if err != nil {
           server.Log("Error parsing session connect: %s", err)
           continue
         }
 
-        session.remote = client_addr
+        // TODO: fix, was client_addr but the client doesnt know it's nat assignment
+        session.remote = from
         session.LastSeen = time.Now()
         
         // TODO: Make a better server hello