diff --git a/GlitchyEngine/src/World/EcsWorld.bf b/GlitchyEngine/src/World/EcsWorld.bf
index 569c927..270acc1 100644
--- a/GlitchyEngine/src/World/EcsWorld.bf
+++ b/GlitchyEngine/src/World/EcsWorld.bf
@@ -25,19 +25,20 @@ namespace GlitchyEngine.World
 		
 		public ~this()
 		{
+			for(var entry in _entities)
+			{
+				DisposeComponents(entry);
+
+				delete entry.ComponentMask;
+			}
+
+			delete _entities;
 			for(var entry in _componentPools)
 			{
 				delete entry.value.Pool;
 			}
 
 			delete _componentPools;
-
-			for(var entry in _entities)
-			{
-				delete entry.ComponentMask;
-			}
-
-			delete _entities;
 		}
 		
 		/**