diff --git a/src/js/game/entity_manager.ts b/src/js/game/entity_manager.ts
index 0d603a9e..0e0e4645 100644
--- a/src/js/game/entity_manager.ts
+++ b/src/js/game/entity_manager.ts
@@ -149,12 +149,19 @@ export class EntityManager extends BasicSerializableObject {
 
     /**
      * Returns all entities having the given component
+     * @deprecated use {@link getEntitiesWithComponent} instead
      */
     getAllWithComponent(componentHandle: typeof Component): Entity[] {
-        // TODO: Convert usages to set as well
         return [...(this.componentToEntity[componentHandle.getId()] ?? new Set())];
     }
 
+    /**
+     * A version of {@link getAllWithComponent} that returns a Set
+     */
+    getEntitiesWithComponent(componentHandle: typeof Component): Set<Entity> {
+        return new Set(this.componentToEntity[componentHandle.getId()] ?? []);
+    }
+
     /**
      * Unregisters all components of an entity from the component to entity mapping
      */
diff --git a/src/js/game/systems/belt.js b/src/js/game/systems/belt.js
index c0db6ff7..6893e546 100644
--- a/src/js/game/systems/belt.js
+++ b/src/js/game/systems/belt.js
@@ -7,12 +7,11 @@ import { AtlasSprite } from "../../core/sprites";
 import { fastArrayDeleteValue } from "../../core/utils";
 import { enumDirection, enumDirectionToVector, enumInvertedDirections, Vector } from "../../core/vector";
 import { BeltPath } from "../belt_path";
-import { arrayBeltVariantToRotation, MetaBeltBuilding } from "../buildings/belt";
 import { getCodeFromBuildingData } from "../building_codes";
+import { arrayBeltVariantToRotation, MetaBeltBuilding } from "../buildings/belt";
 import { BeltComponent } from "../components/belt";
 import { Entity } from "../entity";
 import { GameSystem } from "../game_system";
-import { GameSystemWithFilter } from "../game_system_with_filter";
 import { MapChunkView } from "../map_chunk_view";
 import { defaultBuildingVariant } from "../meta_building";
 
@@ -424,10 +423,9 @@ export class BeltSystem extends GameSystem {
 
         const result = [];
 
-        const beltEntities = this.root.entityMgr.getAllWithComponent(BeltComponent);
+        const beltEntities = this.root.entityMgr.getEntitiesWithComponent(BeltComponent);
 
-        for (let i = 0; i < beltEntities.length; ++i) {
-            const entity = beltEntities[i];
+        for (const entity of beltEntities) {
             if (visitedUids.has(entity.uid)) {
                 continue;
             }