diff --git a/worlds/sm64ex/__init__.py b/worlds/sm64ex/__init__.py
index 5a4f2c7e..a8598725 100644
--- a/worlds/sm64ex/__init__.py
+++ b/worlds/sm64ex/__init__.py
@@ -95,7 +95,7 @@ class SM64World(World):
             return
         data = {
             "slot_data": self.fill_slot_data(),
-            "location_to_item": {self.location_name_to_id[i] : item_table[self.world.get_location(i, self.player).item.name] for i in self.location_name_to_id},
+            "location_to_item": {self.location_name_to_id[i.name] : item_table[i.item.name] for i in self.world.get_locations()},
             "data_package": {
                 "data": {
                     "games": {
diff --git a/worlds/v6/__init__.py b/worlds/v6/__init__.py
index 71c8bccc..1970c482 100644
--- a/worlds/v6/__init__.py
+++ b/worlds/v6/__init__.py
@@ -67,7 +67,7 @@ class V6World(World):
             return
         data = {
             "slot_data": self.fill_slot_data(),
-            "location_to_item": {self.location_name_to_id[i] : item_table[self.world.get_location(i, self.player).item.name] for i in self.location_name_to_id},
+            "location_to_item": {self.location_name_to_id[i.name] : item_table[i.item.name] for i in self.world.get_locations()},
             "data_package": {
                 "data": {
                     "games": {