diff --git a/BaseClasses.py b/BaseClasses.py
index e74c9ac5..8bfdc544 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -71,7 +71,6 @@ class World(object):
         self.fix_palaceofdarkness_exit = {}
         self.fix_trock_exit = {}
         self.shuffle_ganon = shuffle_ganon
-        self.fix_gtower_exit = self.shuffle_ganon
         self.custom = custom
         self.customitemarray = customitemarray
         self.can_take_damage = True
@@ -133,6 +132,7 @@ class World(object):
             set_player_attr('fix_skullwoods_exit', self.shuffle[player] not in ['vanilla', 'simple', 'restricted', 'dungeonssimple'] or self.doorShuffle[player] not in ['vanilla'])
             set_player_attr('fix_palaceofdarkness_exit', self.shuffle[player] not in ['vanilla', 'simple', 'restricted', 'dungeonssimple'])
             set_player_attr('fix_trock_exit', self.shuffle[player] not in ['vanilla', 'simple', 'restricted', 'dungeonssimple'])
+            set_player_attr('fix_gtower_exit', self.shuffle_ganon[player] > 0)
             set_player_attr('can_access_trock_eyebridge', None)
             set_player_attr('can_access_trock_front', None)
             set_player_attr('can_access_trock_big_chest', None)
diff --git a/source/overworld/EntranceShuffle2.py b/source/overworld/EntranceShuffle2.py
index 994f5f50..c65c4fb8 100644
--- a/source/overworld/EntranceShuffle2.py
+++ b/source/overworld/EntranceShuffle2.py
@@ -504,7 +504,7 @@ def remove_from_list(t_list, removals):
 def do_holes_and_linked_drops(entrances, exits, avail, cross_world):
     holes_to_shuffle = [x for x in entrances if x in drop_map]
 
-    if not avail.world.shuffle_ganon:
+    if not avail.world.shuffle_ganon[avail.player]:
         if avail.world.is_tile_swapped(0x1b, avail.player) and 'Inverted Pyramid Hole' in holes_to_shuffle:
             connect_entrance('Inverted Pyramid Hole', 'Pyramid', avail)
             connect_two_way('Pyramid Entrance', 'Pyramid Exit', avail)