diff --git a/package.json b/package.json
index d81003b..2971aaa 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     "displayName": "DragonECS-ClassicThreads",
     "description": "Classic C# Multithreading for DragonECS",
     "unity": "2020.3",
-    "version": "0.2.4",
+    "version": "0.2.5",
     "repository": {
         "type": "git",
         "url": "https://github.com/DCFApixels/DragonECS-ClassicThreads.git"
diff --git a/src/ThreadRunner.cs b/src/ThreadRunner.cs
index 88883c6..3c787d0 100644
--- a/src/ThreadRunner.cs
+++ b/src/ThreadRunner.cs
@@ -1,6 +1,7 @@
 using DCFApixels.DragonECS.ClassicThreadsInternal;
 using System;
 using System.Collections.Concurrent;
+using System.Linq;
 using System.Threading;
 
 namespace DCFApixels.DragonECS
@@ -66,9 +67,16 @@ namespace DCFApixels.DragonECS
 
         public static void Run(EcsThreadHandler worker, EcsSpan entities, int minSpanSize)
         {
+            if (_isRunning)
+            {
 #if (DEBUG && !DISABLE_DEBUG) || ENABLE_DRAGONECS_ASSERT_CHEKS
-            if (_isRunning) { Throw.DoubleParallelIteration(); }
+                if (_threads.Any(o => o.thread == Thread.CurrentThread))
+                {
+                    Throw.DoubleParallelIteration();
+                }
 #endif
+                while (_isRunning) { }
+            }
             _isRunning = true;
             _worker = worker;