diff --git a/Source/CombatExtended/CombatExtended/Verbs/Verb_MeleeAttackCE.cs b/Source/CombatExtended/CombatExtended/Verbs/Verb_MeleeAttackCE.cs
index 507be08f03..aed08e3afa 100644
--- a/Source/CombatExtended/CombatExtended/Verbs/Verb_MeleeAttackCE.cs
+++ b/Source/CombatExtended/CombatExtended/Verbs/Verb_MeleeAttackCE.cs
@@ -471,6 +471,7 @@ protected virtual IEnumerable<DamageInfo> DamageInfosToApply(LocalTargetInfo tar
             damageInfo.SetWeaponBodyPartGroup(bodyPartGroupDef);
             damageInfo.SetWeaponHediff(hediffDef);
             damageInfo.SetAngle(direction);
+            damageInfo.SetTool(tool);
             yield return damageInfo;
             if (this.tool != null && this.tool.extraMeleeDamages != null)
             {
diff --git a/Source/CombatExtended/Harmony/Harmony_DamageWorker.cs b/Source/CombatExtended/Harmony/Harmony_DamageWorker.cs
index d0696f5254..78e426d75b 100644
--- a/Source/CombatExtended/Harmony/Harmony_DamageWorker.cs
+++ b/Source/CombatExtended/Harmony/Harmony_DamageWorker.cs
@@ -20,7 +20,7 @@ public static bool Prefix(DamageWorker __instance, DamageInfo dinfo, Thing victi
             {
                 return true;
             }
-            if (victim.def.useHitPoints && dinfo.Def.harmsHealth && dinfo.Def != DamageDefOf.Mining)
+            if (victim.def.useHitPoints && dinfo.Def.harmsHealth && dinfo.tool == null && dinfo.Def != DamageDefOf.Mining)
             {
                 if (victim.def.category == ThingCategory.Building)
                 {