diff --git a/Fill.py b/Fill.py
index 9633da49..75637093 100644
--- a/Fill.py
+++ b/Fill.py
@@ -360,18 +360,18 @@ def distribute_items_restrictive(world, gftower_trash=False, fill_locations=None
     for player in range(1, world.players + 1):
         if world.shuffle_bonk_drops[player]:
             for item in world.itempool:
-                if item.name in ['Big Magic']:
+                if item.name in ['Big Magic'] and item.player == player:
                     pot_item_pool[player].append(item)
                     break
-        
     from Regions import bonk_prize_table
     for player, magic_pool in pot_item_pool.items():
-        world.itempool.remove(magic_pool[0])
-        pot_locations = [location for location in fill_locations if location.player == player
-                and location.name in [n for n, (_, _, aga, _, _, _) in bonk_prize_table.items() if not aga]]
-        pot_locations = filter_pot_locations(pot_locations, world)
-        fast_fill_helper(world, magic_pool, pot_locations)
-        pots_used = True
+        if len(magic_pool) > 0:
+            world.itempool.remove(magic_pool[0])
+            pot_locations = [location for location in fill_locations if location.player == player
+                    and location.name in [n for n, (_, _, aga, _, _, _) in bonk_prize_table.items() if not aga]]
+            pot_locations = filter_pot_locations(pot_locations, world)
+            fast_fill_helper(world, magic_pool, pot_locations)
+            pots_used = True
     
     if pots_used:
         fill_locations = world.get_unfilled_locations()
diff --git a/Regions.py b/Regions.py
index 435f7622..a37b7da5 100644
--- a/Regions.py
+++ b/Regions.py
@@ -1312,7 +1312,7 @@ bonk_prize_table = {
     'Hype Cave Statue':                 (0x29, 0x10, False, '', 'Hype Cave Area',                 'encased in stone')
 }
 
-bonk_table_by_location_id = {0x153B00+(data[0]*6)+3: name for name, data in bonk_prize_table.items()}
+bonk_table_by_location_id = {0x2ABB00+(data[0]*6)+3: name for name, data in bonk_prize_table.items()}
 bonk_table_by_location = {y: x for x, y in bonk_table_by_location_id.items()}