diff --git a/exp_legacy/module/modules/gui/tool.lua b/exp_legacy/module/modules/gui/tool.lua
index be36d435..82123d1b 100644
--- a/exp_legacy/module/modules/gui/tool.lua
+++ b/exp_legacy/module/modules/gui/tool.lua
@@ -83,11 +83,13 @@ local tool_gui_waterfill_b =
         if Selection.is_selecting(player, SelectionWaterfillArea) then
             Selection.stop(player)
             return player.print{ "exp-commands_waterfill.exit" }
-        elseif player.get_item_count("cliff-explosives") == 0 then
-            return player.print{ "exp-commands_waterfill.requires-explosives" }
         else
-            Selection.start(player, SelectionWaterfillArea)
-            return player.print{ "exp-commands_waterfill.enter" }
+            if player.get_item_count("cliff-explosives") == 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)
 
diff --git a/exp_scenario/module/commands/waterfill.lua b/exp_scenario/module/commands/waterfill.lua
index 02c0a5a5..f612e075 100644
--- a/exp_scenario/module/commands/waterfill.lua
+++ b/exp_scenario/module/commands/waterfill.lua
@@ -41,7 +41,9 @@ Selection.on_selection(SelectionName, function(event)
         return
     end
 
-    local item_count_total = player.get_item_count("cliff-explosives") + math.min(math.floor(player.get_item_count("explosives") / 10), player.get_item_count("barrel"), player.get_item_count("grenade"))
+    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 < area_size then
         player.print({ "exp-commands_waterfill.too-few-explosives", area_size, item_count_total }, Commands.print_settings.error)