diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/combat/CombatManager.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/combat/CombatManager.java
index 6e6147792..ab3cc5171 100644
--- a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/combat/CombatManager.java
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/combat/CombatManager.java
@@ -487,8 +487,8 @@ public class CombatManager extends MiniPlugin
 					if (log.GetAssists() > 0)
 						killPlayer += " + " + log.GetAssists();
 
-					String weapon = log.GetKiller().GetLastDamageSource();
-					
+					String weapon = (String) log.GetKiller().GetDamage().getFirst().getMetadata().get("customWeapon");
+					weapon = weapon == null ? log.GetKiller().GetLastDamageSource() : weapon;
 					UtilPlayer.message(
 							cur,
 							F.main("Death",
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellSummonWolves.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellSummonWolves.java
index e546be6dc..b93e0d450 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellSummonWolves.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellSummonWolves.java
@@ -86,6 +86,7 @@ public class SpellSummonWolves extends Spell implements SpellClick, SpellClickBl
 			if (tamer instanceof Player)
 			{
 				event.SetDamager((Player) tamer);
+				event.setMetadata("customWeapon", "Summon Wolves");
 				event.setKnockbackOrigin(wolf.getLocation());
 			}
 		}