diff --git a/BaseClasses.py b/BaseClasses.py
index d979f3ba..e8127d65 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -685,8 +685,7 @@ class CollectionState(object):
                 or (self.has('Cane of Byrna', player) and (enemies < 6 or self.can_extend_magic(player)))
                 or self.can_shoot_arrows(player)
                 or self.has('Fire Rod', player)
-                or (self.can_use_bombs(player) and enemies < 6)
-               )
+                )
 
     def can_use_bombs(self, player):
         return (self.has('Bomb Upgrade (+10)', player) or not self.world.futuro[player])
diff --git a/Bosses.py b/Bosses.py
index dd90bb6e..e336cfb6 100644
--- a/Bosses.py
+++ b/Bosses.py
@@ -39,7 +39,7 @@ def MoldormDefeatRule(state, player):
     return state.has_blunt_weapon(player)
 
 def HelmasaurKingDefeatRule(state, player):
-    return state.has_sword(player) or state.can_shoot_arrows(player)
+    return state.has('Hammer', player) or (state.can_use_bombs(player) and (state.has_sword(player) or state.can_shoot_arrows(player)))
 
 def ArrghusDefeatRule(state, player):
     if not state.has('Hookshot', player):