diff --git a/cl_dll/death.cpp b/cl_dll/death.cpp
index 97d4900e..095d48bd 100644
--- a/cl_dll/death.cpp
+++ b/cl_dll/death.cpp
@@ -167,8 +167,7 @@ int CHudDeathNotice :: MsgFunc_DeathMsg( const char *pszName, int iSize, void *p
 
 	char killedwith[32];
 	strcpy( killedwith, "d_" );
-	strncat( killedwith, READ_STRING(), 32 );
-
+	strncat( killedwith, READ_STRING(), sizeof(killedwith) - strlen(killedwith) - 1 );
 
 	gHUD.m_Spectator.DeathMessage(victim);