diff --git a/mods/ITEMS/mcl_buckets/init.lua b/mods/ITEMS/mcl_buckets/init.lua
index 70a219ffbe..fdd08bdf92 100644
--- a/mods/ITEMS/mcl_buckets/init.lua
+++ b/mods/ITEMS/mcl_buckets/init.lua
@@ -3,6 +3,7 @@ local modname = minetest.get_current_modname()
 local S = minetest.get_translator(modname)
 local modpath = minetest.get_modpath(modname)
 
+-- Compatibility with old bucket mod
 minetest.register_alias("bucket:bucket_empty", "mcl_buckets:bucket_empty")
 minetest.register_alias("bucket:bucket_water", "mcl_buckets:bucket_water")
 minetest.register_alias("bucket:bucket_lava", "mcl_buckets:bucket_lava")
@@ -11,6 +12,7 @@ local mod_doc = minetest.get_modpath("doc")
 local mod_mcl_core = minetest.get_modpath("mcl_core")
 --local mod_mclx_core = minetest.get_modpath("mclx_core")
 
+-- Localize some functions for faster access
 local vector = vector
 local math = math
 local string = string
@@ -127,16 +129,15 @@ function mcl_buckets.register_liquid(def)
 			if pointed_thing.type ~= "node" then
 				return
 			end
+			-- Call on_rightclick if the pointed node defines it
+			local new_stack = mcl_util.call_on_rightclick(itemstack, user, pointed_thing)
+			if new_stack then
+				return new_stack
+			end
 
 			local node = minetest.get_node(pointed_thing.under)
 			local place_pos = pointed_thing.under
 			local nn = node.name
-			-- Call on_rightclick if the pointed node defines it
-			if user and not user:get_player_control().sneak then
-				if minetest.registered_nodes[nn] and minetest.registered_nodes[nn].on_rightclick then
-					return minetest.registered_nodes[nn].on_rightclick(place_pos, node, user, itemstack) or itemstack
-				end
-			end
 
 			local node_place
 			if type(def.source_place) == "function" then
@@ -306,16 +307,20 @@ minetest.register_craftitem("mcl_buckets:bucket_empty", {
 				return itemstack
 			end
 		end]]
+		-- Must be pointing to node
 		if pointed_thing.type ~= "node" then
 			return itemstack
 		end
+
+		-- Call on_rightclick if the pointed node defines it
+		local new_stack = mcl_util.call_on_rightclick(itemstack, user, pointed_thing)
+		if new_stack then
+			return new_stack
+		end
+
 		local node = minetest.get_node(pointed_thing.under)
 		local nn = node.name
-		if user and not user:get_player_control().sneak then
-			if minetest.registered_nodes[nn] and minetest.registered_nodes[nn].on_rightclick then
-				return minetest.registered_nodes[nn].on_rightclick(pointed_thing.under, node, user, itemstack) or itemstack
-			end
-		end
+
 		local new_bucket
 		local liquid_node = bucket_raycast(user)
 		if liquid_node then
diff --git a/mods/ITEMS/mcl_buckets/mod.conf b/mods/ITEMS/mcl_buckets/mod.conf
index 5a78e70ada..0d7b764b87 100644
--- a/mods/ITEMS/mcl_buckets/mod.conf
+++ b/mods/ITEMS/mcl_buckets/mod.conf
@@ -1,6 +1,6 @@
 name = mcl_buckets
 author = Kahrl
 description =
-depends = mcl_worlds
+depends = mcl_worlds, mcl_util
 optional_depends = mcl_core, mclx_core, doc