diff --git a/OverworldShuffle.py b/OverworldShuffle.py
index 8d61630d..235849aa 100644
--- a/OverworldShuffle.py
+++ b/OverworldShuffle.py
@@ -1479,7 +1479,7 @@ def build_sectors(world, player):
     
     return sectors
 
-def build_accessible_region_list(world, start_region, player, build_copy_world=False, cross_world=False, region_rules=True, ignore_ledges = False):
+def build_accessible_region_list(world, start_region, player, build_copy_world=False, cross_world=False, region_rules=True, ignore_ledges=False, restrictive_follower=False):
     from BaseClasses import CollectionState
     from Main import copy_world_premature
     from Items import ItemFactory
@@ -1500,9 +1500,11 @@ def build_accessible_region_list(world, start_region, player, build_copy_world=F
                         if flutespot.connected_region and flutespot.connected_region.name not in explored_regions:
                             explore_region(flutespot.connected_region.name, flutespot.connected_region)
                 elif exit.connected_region.name not in explored_regions \
-                        and (exit.connected_region.type == region.type 
-                            or exit.name in OWExitTypes['OWEdge'] or (cross_world and exit.name in (OWExitTypes['Portal'] + OWExitTypes['Mirror']))) \
-                        and (not region_rules or exit.access_rule(blank_state)) and (not ignore_ledges or exit.name not in (OWExitTypes['Ledge'] + OWExitTypes['OWG'])):
+                        and (exit.connected_region.type == region.type or exit.name in OWExitTypes['OWEdge'] 
+                            or (cross_world and exit.name in (OWExitTypes['Portal'] + OWExitTypes['Mirror']))) \
+                        and (not region_rules or exit.access_rule(blank_state)) \
+                        and (not restrictive_follower or exit.spot_type != 'OWG') \
+                        and (not ignore_ledges or exit.name not in (OWExitTypes['Ledge'] + OWExitTypes['OWG'])):
                     explore_region(exit.connected_region.name, exit.connected_region)
     
     if build_copy_world:
diff --git a/source/overworld/EntranceShuffle2.py b/source/overworld/EntranceShuffle2.py
index c65c4fb8..d693eae6 100644
--- a/source/overworld/EntranceShuffle2.py
+++ b/source/overworld/EntranceShuffle2.py
@@ -405,7 +405,7 @@ def do_old_man_cave_exit(entrances, exits, avail, cross_world):
             region_name = 'West Death Mountain (Top)'
         else:
             region_name = 'West Dark Death Mountain (Top)'
-        om_cave_options = list(get_accessible_entrances(region_name, avail, [], cross_world, True, True, True))
+        om_cave_options = list(get_accessible_entrances(region_name, avail, [], cross_world, True, True, True, True))
         om_cave_options = [e for e in om_cave_options if e in entrances and e != 'Old Man House (Bottom)']
         if avail.swapped:
             om_cave_options = [e for e in om_cave_options if e not in Forbidden_Swap_Entrances]
@@ -863,7 +863,7 @@ def get_nearby_entrances(avail, start_region):
     return candidates
 
 
-def get_accessible_entrances(start_region, avail, assumed_inventory=[], cross_world=False, region_rules=True, exit_rules=True, include_one_ways=False):
+def get_accessible_entrances(start_region, avail, assumed_inventory=[], cross_world=False, region_rules=True, exit_rules=True, include_one_ways=False, restrictive_follower=False):
     from Main import copy_world_premature
     from BaseClasses import CollectionState
     from Items import ItemFactory
@@ -881,7 +881,7 @@ def get_accessible_entrances(start_region, avail, assumed_inventory=[], cross_wo
     for item in assumed_inventory:
         blank_state.collect(ItemFactory(item, avail.player), True)
 
-    explored_regions = list(build_accessible_region_list(base_world, start_region, avail.player, False, cross_world, region_rules, False))
+    explored_regions = list(build_accessible_region_list(base_world, start_region, avail.player, False, cross_world, region_rules, False, restrictive_follower))
 
     if include_one_ways:
         new_regions = list()