diff --git a/src/EC/Manager.hpp b/src/EC/Manager.hpp
index bcb0537..aebe0ab 100644
--- a/src/EC/Manager.hpp
+++ b/src/EC/Manager.hpp
@@ -697,7 +697,7 @@ namespace EC
                 threadPool->wakeThreads();
                 do {
                     std::this_thread::sleep_for(std::chrono::microseconds(200));
-                } while(!threadPool->isQueueEmpty() && !threadPool->isAllThreadsWaiting());
+                } while(!threadPool->isQueueEmpty() || !threadPool->isAllThreadsWaiting());
             }
         }
 
@@ -816,7 +816,7 @@ namespace EC
                 threadPool->wakeThreads();
                 do {
                     std::this_thread::sleep_for(std::chrono::microseconds(200));
-                } while(!threadPool->isQueueEmpty() && !threadPool->isAllThreadsWaiting());
+                } while(!threadPool->isQueueEmpty() || !threadPool->isAllThreadsWaiting());
             }
         }
 
@@ -960,7 +960,7 @@ namespace EC
                         threadPool->wakeThreads();
                         do {
                             std::this_thread::sleep_for(std::chrono::microseconds(200));
-                        } while(!threadPool->isQueueEmpty() && !threadPool->isAllThreadsWaiting());
+                        } while(!threadPool->isQueueEmpty() || !threadPool->isAllThreadsWaiting());
                     }
                 })));
 
@@ -1039,7 +1039,7 @@ namespace EC
                 threadPool->wakeThreads();
                 do {
                     std::this_thread::sleep_for(std::chrono::microseconds(200));
-                } while(!threadPool->isQueueEmpty() && !threadPool->isAllThreadsWaiting());
+                } while(!threadPool->isQueueEmpty() || !threadPool->isAllThreadsWaiting());
             }
 
             return matchingV;
@@ -1426,7 +1426,7 @@ namespace EC
                 threadPool->wakeThreads();
                 do {
                     std::this_thread::sleep_for(std::chrono::microseconds(200));
-                } while(!threadPool->isQueueEmpty() && !threadPool->isAllThreadsWaiting());
+                } while(!threadPool->isQueueEmpty() || !threadPool->isAllThreadsWaiting());
             }
 
             // call functions on matching entities
@@ -1488,7 +1488,7 @@ namespace EC
                         threadPool->wakeThreads();
                         do {
                             std::this_thread::sleep_for(std::chrono::microseconds(200));
-                        } while(!threadPool->isQueueEmpty() && !threadPool->isAllThreadsWaiting());
+                        } while(!threadPool->isQueueEmpty() || !threadPool->isAllThreadsWaiting());
                     }
                 }
             );
@@ -1627,7 +1627,7 @@ namespace EC
                 threadPool->wakeThreads();
                 do {
                     std::this_thread::sleep_for(std::chrono::microseconds(200));
-                } while(!threadPool->isQueueEmpty() && !threadPool->isAllThreadsWaiting());
+                } while(!threadPool->isQueueEmpty() || !threadPool->isAllThreadsWaiting());
             }
 
             // call functions on matching entities
@@ -1694,7 +1694,7 @@ namespace EC
                         threadPool->wakeThreads();
                         do {
                             std::this_thread::sleep_for(std::chrono::microseconds(200));
-                        } while(!threadPool->isQueueEmpty() && !threadPool->isAllThreadsWaiting());
+                        } while(!threadPool->isQueueEmpty() || !threadPool->isAllThreadsWaiting());
                     }
                 }
             );
@@ -1767,7 +1767,7 @@ namespace EC
                 threadPool->wakeThreads();
                 do {
                     std::this_thread::sleep_for(std::chrono::microseconds(200));
-                } while(!threadPool->isQueueEmpty() && !threadPool->isAllThreadsWaiting());
+                } while(!threadPool->isQueueEmpty() || !threadPool->isAllThreadsWaiting());
             }
         }
 
@@ -1856,7 +1856,7 @@ namespace EC
                 threadPool->wakeThreads();
                 do {
                     std::this_thread::sleep_for(std::chrono::microseconds(200));
-                } while(!threadPool->isQueueEmpty() && !threadPool->isAllThreadsWaiting());
+                } while(!threadPool->isQueueEmpty() || !threadPool->isAllThreadsWaiting());
             }
         }
     };