diff --git a/bank.lua b/bank.lua
index 2dab7b0..304aff4 100644
--- a/bank.lua
+++ b/bank.lua
@@ -85,7 +85,7 @@ core.register_node("emeraldbank:bank", {
 	   "default_steel_block.png^mcl_core_emerald.png"
 	},
 	stack_max = 64,
-	groups = {pickaxey=1, handy=1, building_block=1, enderman_takable=1},
+	groups = {pickaxey=1, handy=1, building_block=1},
 	sounds = mcl_sounds.node_sound_metal_defaults(),
 	_mcl_blast_resistance = 5,
 	_mcl_hardness = 1,
diff --git a/shop.lua b/shop.lua
index ecd6e12..94aa173 100644
--- a/shop.lua
+++ b/shop.lua
@@ -213,8 +213,9 @@ core.register_node("emeraldbank:shop", {
 	 "default_tree.png^mcl_core_emerald.png"
       },
       stack_max = 64,
-      groups = {axey=1, handy=1, building_block=1, enderman_takable=1},
+      groups = {axey=1, handy=1, building_block=1},
       sounds = mcl_sounds.node_sound_wood_defaults(),
+      drop = emeraldbank.shop_drop,
       _mcl_blast_resistance = 5,
       _mcl_hardness = 1,
       
@@ -239,9 +240,9 @@ core.register_node("emeraldbank:shop_empty", {
 	 "default_tree.png^mcl_core_emerald.png^mcl_core_barrier.png"
       },
       stack_max = 64,
-      groups = {axey=1, handy=1, building_block=1, enderman_takable=1, not_in_creative_inventory=1},
+      groups = {axey=1, handy=1, building_block=1, not_in_creative_inventory=1},
       sounds = mcl_sounds.node_sound_wood_defaults(),
-      drop = "emeraldbank:shop",
+      drop = emeraldbank.shop_empty_drop,
       _mcl_blast_resistance = 5,
       _mcl_hardness = 1,