diff --git a/conn/conn.go b/conn/conn.go
index 705901b..547796e 100644
--- a/conn/conn.go
+++ b/conn/conn.go
@@ -90,7 +90,7 @@ func (m Conn) Cleanup() error {
 	return nil
 }
 
-func NewConn(sam sam3.SAM, addr, path string, opts []string) (*Conn, error) {
+func NewConn(sam sam3.SAM, addr, path string, opts []string) (Conn, error) {
 	var c Conn
 	var err error
 	c.SAM = &sam
@@ -113,7 +113,7 @@ func NewConn(sam sam3.SAM, addr, path string, opts []string) (*Conn, error) {
 	if err != nil {
 		return nil, err
 	}
-	return &c, nil
+	return c, nil
 }
 
 // RandTunName generates a random tunnel names to avoid collisions
diff --git a/socks/manager.go b/socks/manager.go
index 54c97bf..02a7bbd 100644
--- a/socks/manager.go
+++ b/socks/manager.go
@@ -19,7 +19,7 @@ type Manager struct {
 	resolver.Resolver
 	socks5.Config
 	*sam3.SAM
-	conns   []*conn.Conn
+	conns   []conn.Conn
 	datadir string
 	host    string
 	port    string
@@ -57,7 +57,7 @@ func (m Manager) DialI2P(ctx context.Context, addr string) (*sam3.SAMConn, error
 	}
 	m.conns = append(m.conns, newconn)
 	log.Println("Generated destination for address:", i2paddr.Base32(), "at position", len(m.conns)-1)
-	return m.conns[len(m.conns)-1].SAMConn, nil
+	return &m.conns[len(m.conns)-1].SAMConn, nil
 }
 
 func (m Manager) Dial(ctx context.Context, network, addr string) (net.Conn, error) {