diff --git a/internal/multiplex/obfs.go b/internal/multiplex/obfs.go
index 0f91999..1f55a7c 100644
--- a/internal/multiplex/obfs.go
+++ b/internal/multiplex/obfs.go
@@ -137,8 +137,8 @@ func MakeDeobfs(salsaKey [32]byte, payloadCipher cipher.AEAD) Deobfser {
 	return deobfs
 }
 
-func MakeObfuscator(encryptionMethod byte, sessionKey [32]byte) (obfuscator *Obfuscator, err error) {
-	obfuscator = &Obfuscator{
+func MakeObfuscator(encryptionMethod byte, sessionKey [32]byte) (obfuscator Obfuscator, err error) {
+	obfuscator = Obfuscator{
 		SessionKey: sessionKey,
 	}
 	var payloadCipher cipher.AEAD
@@ -164,7 +164,7 @@ func MakeObfuscator(encryptionMethod byte, sessionKey [32]byte) (obfuscator *Obf
 		}
 		obfuscator.minOverhead = payloadCipher.Overhead()
 	default:
-		return nil, errors.New("Unknown encryption method")
+		return obfuscator, errors.New("Unknown encryption method")
 	}
 
 	obfuscator.Obfs = MakeObfs(sessionKey, payloadCipher)
diff --git a/internal/multiplex/session.go b/internal/multiplex/session.go
index 1d6b1cb..fd0096a 100644
--- a/internal/multiplex/session.go
+++ b/internal/multiplex/session.go
@@ -24,7 +24,7 @@ var errRepeatSessionClosing = errors.New("trying to close a closed session")
 type switchboardStrategy int
 
 type SessionConfig struct {
-	*Obfuscator
+	Obfuscator
 
 	Valve