diff --git a/mods/bucket/init.lua b/mods/bucket/init.lua
index d1caf160..ec6eaa70 100644
--- a/mods/bucket/init.lua
+++ b/mods/bucket/init.lua
@@ -51,16 +51,18 @@ end
 -- This function can be called from any mod (that depends on bucket).
 function bucket.register_liquid(source, flowing, itemname, inventory_image, name,
 		groups, force_renew)
+	local itemname_raw = itemname
+	itemname = itemname:match(":(.+)") or itemname
 	bucket.liquids[source] = {
 		source = source,
 		flowing = flowing,
-		itemname = itemname:sub(1,1) == ":" and itemname:sub(2) or itemname,
+		itemname = itemname,
 		force_renew = force_renew,
 	}
 	bucket.liquids[flowing] = bucket.liquids[source]
 
 	if itemname ~= nil then
-		minetest.register_craftitem(itemname, {
+		minetest.register_craftitem(itemname_raw, {
 			description = name,
 			inventory_image = inventory_image,
 			stack_max = 1,