diff --git a/OverworldShuffle.py b/OverworldShuffle.py
index 625e43d2..6663bdf7 100644
--- a/OverworldShuffle.py
+++ b/OverworldShuffle.py
@@ -1404,6 +1404,9 @@ def can_reach_smith(world, player):
     if world.logic[player] in ['noglitches', 'minorglitches'] and not world.is_tile_swapped(0x29, player):
         blank_state.collect(ItemFactory('Titans Mitts', player), True)
         blank_state.collect(ItemFactory('Moon Pearl', player), True)
+    if not world.bombbag[player]:
+        blank_state.collect(ItemFactory('Farmable Bombs', player), True)
+    blank_state.collect(ItemFactory('Farmable Rupees', player), True)
     
     found = False
     explored_regions = list()