diff --git a/envs/monkey_zoo/blackbox/test_blackbox.py b/envs/monkey_zoo/blackbox/test_blackbox.py
index 286912a6f..b447e0606 100644
--- a/envs/monkey_zoo/blackbox/test_blackbox.py
+++ b/envs/monkey_zoo/blackbox/test_blackbox.py
@@ -151,7 +151,7 @@ class TestMonkeyBlackbox:
             island_client=island_client,
             raw_config=raw_config,
             analyzers=[zero_logon_analyzer, communication_analyzer],
-            timeout=DEFAULT_TIMEOUT_SECONDS,
+            timeout=DEFAULT_TIMEOUT_SECONDS + 30,
             log_handler=log_handler,
         ).run()
 
diff --git a/monkey/infection_monkey/exploit/tools/smb_tools.py b/monkey/infection_monkey/exploit/tools/smb_tools.py
index 8930bf467..f8367608d 100644
--- a/monkey/infection_monkey/exploit/tools/smb_tools.py
+++ b/monkey/infection_monkey/exploit/tools/smb_tools.py
@@ -137,7 +137,7 @@ class SmbTools(object):
                 share_name,
                 share_path,
                 remote_path,
-                host.ip_addr[0],
+                host,
             )
 
             remote_full_path = ntpath.join(share_path, remote_path.strip(ntpath.sep))