diff --git a/exp_scenario/module/commands/waterfill.lua b/exp_scenario/module/commands/waterfill.lua
index f612e075..161ef81e 100644
--- a/exp_scenario/module/commands/waterfill.lua
+++ b/exp_scenario/module/commands/waterfill.lua
@@ -13,11 +13,16 @@ Commands.new("waterfill", { "exp-commands_waterfill.description" })
         if Selection.is_selecting(player, SelectionName) then
             Selection.stop(player)
             return Commands.status.success{ "exp-commands_waterfill.exit" }
-        elseif player.get_item_count("cliff-explosives") == 0 then
-            return Commands.status.error{ "exp-commands_waterfill.requires-explosives" }
         else
-            Selection.start(player, SelectionName)
-            return Commands.status.success{ "exp-commands_waterfill.enter" }
+            local item_count_cliff = player.get_item_count("cliff-explosives")
+            local item_count_craft = math.min(math.floor(player.get_item_count("explosives") / 10), player.get_item_count("barrel"), player.get_item_count("grenade"))
+            local item_count_total = item_count_cliff + item_count_craft
+            if item_count_total == 0 then
+                return player.print{ "exp-commands_waterfill.requires-explosives" }
+            else
+                Selection.start(player, SelectionWaterfillArea)
+                return player.print{ "exp-commands_waterfill.enter" }
+            end
         end
     end)