diff --git a/lib/safe-harbor.py b/lib/safe-harbor.py
index 944b79e..2c0918a 100755
--- a/lib/safe-harbor.py
+++ b/lib/safe-harbor.py
@@ -38,7 +38,7 @@ if __name__ == "__main__":
 		print("! unable to load any configuration")
 		sys.exit(1)
 	
-	command = ["/usr/bin/ssh", "-o", "ServerAliveInterval 45", "-o", "ServerAliveCountMax 2", "-o", "ExitOnForwardFailure yes", "-N", "-p", str(safe_get(cfg, "port", 22))]
+	command = ["/usr/bin/ssh", "-o", "ServerAliveInterval=45", "-o", "ServerAliveCountMax=2", "-o", "ExitOnForwardFailure=yes", "-o", "ClearAllForwardings=yes", "-N", "-p", str(safe_get(cfg, "port", 22))]
 	
 	for m in cfg["mapping"]:
 		command.append("-R")