1 files changed, 4 insertions, 2 deletions
diff --git a/src/engine.cpp b/src/engine.cpp
index ecc6501..6e6a0e5 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -147,9 +147,11 @@ void Engine::run(void)
     GameState::save("save.json", entities);
 
     // Remove all Lua references from entities
-    entities.each<Scripted>([](entityx::Entity, Scripted &f){ f.cleanup(); });
-    entities.each<EventListener>([](entityx::Entity, EventListener &f){
+    entities.each<Scripted>([](entityx::Entity, Scripted &f) { 
         f.cleanup(); });
+    entities.each<EventListener>([](entityx::Entity, EventListener &f) {
+        f.cleanup(); });
+    systems.system<WorldSystem>()->cleanup();
 }
 
 bool Engine::shouldRun(void)