diff --git a/ReallifeGamemode.Server/Events/Death.cs b/ReallifeGamemode.Server/Events/Death.cs
index 703ccb84..3b00e38c 100644
--- a/ReallifeGamemode.Server/Events/Death.cs
+++ b/ReallifeGamemode.Server/Events/Death.cs
@@ -26,8 +26,8 @@ namespace ReallifeGamemode.Server.Events
       player.SetData("isDead", true);      
 
       //TODO: Zum Full Release entfernen
-      ChatService.SendMessage(player, "Du bist durch " + killer.Name + " gestorben: " + Managers.WeaponManager.GetCauseOfDeathByHash(reason));
-
+      ChatService.SendMessage(player, "Du bist durch " + killer.Name + " gestorben: " + reason.ToString());
+      
       int? killerId;
       float killerPosX;
       float killerPosY;
@@ -59,7 +59,6 @@ namespace ReallifeGamemode.Server.Events
           Autowanted.Check_AutoWanted(killer, player);
           string message = "~y~[HINWEIS]: " + killer.Name + " hat " + player.Name + " getötet (" + Managers.WeaponManager.GetCauseOfDeathByHash(reason)+ ")";
           ChatService.BroadcastAdmin(message, AdminLevel.ADMIN);
-          ChatService.Broadcast("" + reason.ToString());
         }
       }
 
diff --git a/ReallifeGamemode.Server/Managers/WeaponManager.cs b/ReallifeGamemode.Server/Managers/WeaponManager.cs
index 672d2890..e9822ed2 100644
--- a/ReallifeGamemode.Server/Managers/WeaponManager.cs
+++ b/ReallifeGamemode.Server/Managers/WeaponManager.cs
@@ -333,7 +333,7 @@ namespace ReallifeGamemode.Server.Managers
     { 1150790720, "Vehicle Volatol Dual MG"},
     { 1741783703, "Vehicle Water Cannon"},
     { 2441047180, "Navy Revolver" },
-    {  (uint)NAPI.Util.WeaponNameToModel("ceramicpistol"), "Ceramic Pistol"}
+    {  727643628, "Ceramic Pistol"}
     };