diff --git a/src/serverremoteplayer.cpp b/src/serverremoteplayer.cpp
index 8a81f1d2d..9dd4723fd 100644
--- a/src/serverremoteplayer.cpp
+++ b/src/serverremoteplayer.cpp
@@ -183,8 +183,8 @@ void ServerRemotePlayer::punch(ServerActiveObject *puncher,
 	
 	// "Material" groups of the player
 	std::map<std::string, int> groups;
-	groups["snappy"] = 1;
 	groups["choppy"] = 2;
+	groups["fleshy"] = 3;
 
 	IItemDefManager *idef = m_env->getGameDef()->idef();
 	ItemStack punchitem = puncher->getWieldedItem();
diff --git a/src/tool.cpp b/src/tool.cpp
index 3c61ad6e7..69141f4e5 100644
--- a/src/tool.cpp
+++ b/src/tool.cpp
@@ -135,10 +135,10 @@ HitParams getHitParams(const std::map<std::string, int> &groups,
 	DigParams digprop = getDigParams(groups, tp,
 			time_from_last_punch);
 	
-	// If digging time would be 1 second, 8 half-hearts go in 1 second.
+	// Damage in hp is equivalent to nodes dug in time_from_last_punch
 	s16 hp = 0;
 	if(digprop.diggable)
-		hp = 8.0 / digprop.time;
+		hp = time_from_last_punch / digprop.time;
 	// Wear is the same as for digging a single node
 	s16 wear = (float)digprop.wear;