diff --git a/lib/command_buffer.luau b/lib/command_buffer.luau
index a1e48ca..28e4155 100644
--- a/lib/command_buffer.luau
+++ b/lib/command_buffer.luau
@@ -87,7 +87,7 @@ local function flush()
     end
 
     for world in delete_commands do
-        table.clear(delete_commands)
+        table.clear(delete_commands[world])
     end
 end
 
diff --git a/lib/handle.luau b/lib/handle.luau
index b4a8948..90107f5 100644
--- a/lib/handle.luau
+++ b/lib/handle.luau
@@ -63,7 +63,7 @@ function handle:set<T>(id: id<T>, value: T): handle
 end
 
 function handle:remove(id: id): handle
-    world():remove(self.entity, id)
+    self.world:remove(self.entity, id)
     return self
 end