diff --git a/EduNetworkBuilder/Network.cs b/EduNetworkBuilder/Network.cs
index c2b8feb..47d31e2 100644
--- a/EduNetworkBuilder/Network.cs
+++ b/EduNetworkBuilder/Network.cs
@@ -1187,7 +1187,8 @@ namespace EduNetworkBuilder
                 }
             }
             //kill all extra windows that no longer need to be open.
-            KillAllExtraWindows();
+            if(!NB.ProcessingInvisibleNetwork())
+                KillAllExtraWindows();
 
             if (WhatFrom == null)
             {
diff --git a/EduNetworkBuilder/NetworkBuilder.cs b/EduNetworkBuilder/NetworkBuilder.cs
index 8180aa7..655b847 100644
--- a/EduNetworkBuilder/NetworkBuilder.cs
+++ b/EduNetworkBuilder/NetworkBuilder.cs
@@ -2868,6 +2868,7 @@ namespace EduNetworkBuilder
             {
                 myNetwork.Tick(true);
                 myNetwork.NonVisualProcessPacketsMultipleTimes();
+                myNetwork.TestForCompletion(false); //Just in case it needs to be tested
             }
             NB.UnregisterInvisibleNetwork();
         }