diff --git a/client/lib/connwrapper.go b/client/lib/connwrapper.go
index 0eb8d98..eadba2a 100644
--- a/client/lib/connwrapper.go
+++ b/client/lib/connwrapper.go
@@ -9,6 +9,14 @@ import (
 
 var errENOSYS = errors.New("not implemented")
 
+func newPacketConnWrapper(localAddr, remoteAddr net.Addr, rw io.ReadWriter) net.PacketConn {
+	return &packetConnWrapper{
+		ReadWriter: rw,
+		remoteAddr: remoteAddr,
+		localAddr:  localAddr,
+	}
+}
+
 type packetConnWrapper struct {
 	io.ReadWriter
 	remoteAddr net.Addr
diff --git a/client/lib/snowflake.go b/client/lib/snowflake.go
index f4ad630..e31c06c 100644
--- a/client/lib/snowflake.go
+++ b/client/lib/snowflake.go
@@ -344,11 +344,8 @@ func newSession(snowflakes SnowflakeCollector, clientIDCandid turbotunnel.Client
 			return nil, errors.New("handler: Received invalid Snowflake")
 		}
 		log.Println("---- Handler: snowflake assigned ----")
-		packetConnWrapper := &packetConnWrapper{
-			ReadWriter: conn,
-			remoteAddr: dummyAddr{},
-			localAddr:  dummyAddr{},
-		}
+
+		packetConnWrapper := newPacketConnWrapper(dummyAddr{}, dummyAddr{}, conn)
 		return packetConnWrapper, nil
 	}
 	pconn := turbotunnel.NewRedialPacketConn(dummyAddr{}, dummyAddr{}, dialContext)