diff --git a/deco_plants.lua b/deco_plants.lua
index dc724c7..06e1872 100644
--- a/deco_plants.lua
+++ b/deco_plants.lua
@@ -114,7 +114,7 @@ for _, plant in ipairs(fun_caves.plantlist) do
 			description = plant.desc,
 			drawtype = "nodebox",
 			node_box = {type='fixed', fixed={{-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}, {-0.5, 0.5, -0.001, 0.5, 1.5, 0.001}, {-0.001, 0.5, -0.5, 0.001, 1.5, 0.5}}},
-			drop = {max_items=2, items={{items={"fun_caves:"..plant.name}, rarity=1}, {items={"default:sand"}, rarity=1}}},
+			drop = "fun_caves:"..plant.name,
 			tiles = { "default_sand.png", "fun_caves_"..plant.name..".png",},
 			--tiles = { "default_dirt.png", "fun_caves_"..plant.name..".png",},
 			sunlight_propagates = plant.light,
@@ -128,19 +128,23 @@ for _, plant in ipairs(fun_caves.plantlist) do
 				fixed = {-0.5, 0.5, -0.5, 0.5, 11/16, 0.5},
 			},
 			sounds = plant.sounds or default.node_sound_leaves_defaults(),
+			after_dig_node = function(pos, oldnode, oldmetadata, digger)
+				local replacement = oldnode.name:gsub('.*_water_(.*)', 'default:%1')
+				if replacement:find('cloud$') then
+					replacement = replacement:gsub('^default', 'fun_caves')
+				end
+				minetest.set_node(pos, {name = replacement})
+			end,
 		}
 		minetest.register_node("fun_caves:"..plant.name.."_water_sand", def)
 		def2 = table.copy(def)
 		def2.tiles = { "default_dirt.png", "fun_caves_"..plant.name..".png",}
-		def2.drop = {max_items=2, items={{items={"fun_caves:"..plant.name}, rarity=1}, {items={"default:dirt"}, rarity=1}}}
-		minetest.register_node("fun_caves:"..plant.name.."_water_soil", def2)
+		minetest.register_node("fun_caves:"..plant.name.."_water_dirt", def2)
 		def2 = table.copy(def)
 		def2.tiles = { "fun_caves_cloud.png", "fun_caves_"..plant.name..".png",}
-		def2.drop = {max_items=2, items={{items={"fun_caves:"..plant.name}, rarity=1}, {items={"fun_caves:cloud"}, rarity=1}}}
 		minetest.register_node("fun_caves:"..plant.name.."_water_cloud", def2)
 		def2 = table.copy(def)
 		def2.tiles = { "fun_caves_storm_cloud.png", "fun_caves_"..plant.name..".png",}
-		def2.drop = {max_items=2, items={{items={"fun_caves:"..plant.name}, rarity=1}, {items={"fun_caves:storm_cloud"}, rarity=1}}}
 		minetest.register_node("fun_caves:"..plant.name.."_water_storm_cloud", def2)
 	end
 end
@@ -212,9 +216,9 @@ do
 		water_plant_1_def_sand.biomes = nil
 	end
 
-	local water_plant_1_def_soil = table.copy(water_plant_1_def_sand)
-	water_plant_1_def_soil.place_on = {"group:soil"}
-	water_plant_1_def_soil.decoration = {"fun_caves:water_plant_1_water_soil",}
+	local water_plant_1_def_dirt = table.copy(water_plant_1_def_sand)
+	water_plant_1_def_dirt.place_on = {"group:soil"}
+	water_plant_1_def_dirt.decoration = {"fun_caves:water_plant_1_water_dirt",}
 	local water_plant_1_def_cloud = table.copy(water_plant_1_def_sand)
 	water_plant_1_def_cloud.place_on = {"group:cloud"}
 	water_plant_1_def_cloud.decoration = {"fun_caves:water_plant_1_water_cloud",}
@@ -223,7 +227,7 @@ do
 	water_plant_1_def_storm_cloud.decoration = {"fun_caves:water_plant_1_water_storm_cloud",}
 
 	register_water_plant(water_plant_1_def_sand)
-	register_water_plant(water_plant_1_def_soil)
+	register_water_plant(water_plant_1_def_dirt)
 	register_water_plant(water_plant_1_def_cloud)
 	register_water_plant(water_plant_1_def_storm_cloud)
 end