diff --git a/mods/CORE/_mcl_autogroup/init.lua b/mods/CORE/_mcl_autogroup/init.lua
index c0c5021b51..1a259189bc 100644
--- a/mods/CORE/_mcl_autogroup/init.lua
+++ b/mods/CORE/_mcl_autogroup/init.lua
@@ -215,6 +215,10 @@ function mcl_autogroup.can_harvest(nodename, toolname, player)
 		return true
 	end
 
+	if minetest.get_item_group(nodename, "dig_immediate_piston") >= 1 then
+		return true
+	end
+
 	-- Check if it can be dug by tool
 	local tdef = minetest.registered_tools[toolname]
 	if tdef and tdef._mcl_diggroups then
diff --git a/mods/ITEMS/REDSTONE/mesecons_button/init.lua b/mods/ITEMS/REDSTONE/mesecons_button/init.lua
index f7d6c7105f..d6281b5c8c 100644
--- a/mods/ITEMS/REDSTONE/mesecons_button/init.lua
+++ b/mods/ITEMS/REDSTONE/mesecons_button/init.lua
@@ -92,6 +92,7 @@ function mesecon.register_button(basename, description, texture, recipeitem, sou
 	groups_off.dig_by_water=1
 	groups_off.destroy_by_lava_flow=1
 	groups_off.dig_by_piston=1
+	groups_off.dig_immediate_piston=1
 	groups_off.button=1 -- button (off)
 
 	local groups_on = table.copy(groups_off)
diff --git a/mods/ITEMS/mcl_farming/melon.lua b/mods/ITEMS/mcl_farming/melon.lua
index 6bbc507ec9..d622883337 100644
--- a/mods/ITEMS/mcl_farming/melon.lua
+++ b/mods/ITEMS/mcl_farming/melon.lua
@@ -22,7 +22,7 @@ local melon_base_def = {
 	stack_max = 64,
 	tiles = {"farming_melon_top.png", "farming_melon_top.png", "farming_melon_side.png", "farming_melon_side.png", "farming_melon_side.png", "farming_melon_side.png"},
 	groups = {
-		handy = 1, axey = 1, plant = 1, building_block = 1, dig_by_piston = 1,
+		handy = 1, axey = 1, plant = 1, building_block = 1, dig_by_piston = 1, dig_immediate_piston = 1,
 		enderman_takable = 1, compostability = 65
 	},
 	drop = {
diff --git a/mods/ITEMS/mcl_farming/pumpkin.lua b/mods/ITEMS/mcl_farming/pumpkin.lua
index f235baaf38..7387a78c9f 100644
--- a/mods/ITEMS/mcl_farming/pumpkin.lua
+++ b/mods/ITEMS/mcl_farming/pumpkin.lua
@@ -100,7 +100,7 @@ local pumpkin_base_def = {
 	paramtype2 = "facedir",
 	tiles = {"farming_pumpkin_top.png", "farming_pumpkin_top.png", "farming_pumpkin_side.png"},
 	groups = {
-		handy = 1, axey = 1, plant = 1, building_block = 1, dig_by_piston = 1,
+		handy = 1, axey = 1, plant = 1, building_block = 1, dig_by_piston = 1, dig_immediate_piston = 1,
 		enderman_takable = 1, compostability = 65
 	},
 	sounds = mcl_sounds.node_sound_wood_defaults(),