diff --git a/EduNetworkBuilder/Network.cs b/EduNetworkBuilder/Network.cs
index 40e03d0..e91ee12 100644
--- a/EduNetworkBuilder/Network.cs
+++ b/EduNetworkBuilder/Network.cs
@@ -909,10 +909,15 @@ namespace EduNetworkBuilder
                     if (ND != null) ND.PowerOff = true;
                 }
             }
-            if (report_as_done && PuzzleCount == 0 && PreviouslyUnsolved)
+            if (PuzzleCount == 0 && PreviouslyUnsolved)
             {
-                //The puzzle was just solved
-                MarkAsSolved();
+                PuzzleIsSolved = true;
+                if (NB.DebugTests) Console.WriteLine("Recognizing puzzle is solved: " + PuzzleName);
+                if (report_as_done)
+                {
+                    //The puzzle was just solved
+                    MarkAsSolved();
+                }
             }
         }