diff --git a/plugins/tfc/stats_logging.sma b/plugins/tfc/stats_logging.sma
index 801257fa..e7957629 100755
--- a/plugins/tfc/stats_logging.sma
+++ b/plugins/tfc/stats_logging.sma
@@ -25,12 +25,12 @@ public client_disconnect(id) {
   remove_task( id )
   new szTeam[16],szName[MAX_NAME_LENGTH],szAuthid[32], iStats[8], iHits[8], szWeapon[24]
   new iUserid = get_user_userid( id )
-  get_user_team(id, szTeam, 15 )
-  get_user_name(id, szName ,31 )
-  get_user_authid(id, szAuthid , 31 )
+  get_user_team(id, szTeam, charsmax(szTeam) )
+  get_user_name(id, szName , charsmax(szName) )
+  get_user_authid(id, szAuthid , charsmax(szAuthid) )
   for(new i = 1 ; i < TFCMAX_WEAPONS ; ++i ) {
     if( get_user_wstats( id , i ,iStats , iHits ) )   {
-        xmod_get_wpnlogname( i , szWeapon , 23 )
+        xmod_get_wpnlogname( i , szWeapon , charsmax(szWeapon) )
 
         log_message("^"%s<%d><%s><%s>^" triggered ^"weaponstats^" (weapon ^"%s^") (shots ^"%d^") (hits ^"%d^") (kills ^"%d^") (headshots ^"%d^") (tks ^"%d^") (damage ^"%d^") (deaths ^"%d^")",
         szName,iUserid,szAuthid,szTeam,szWeapon,iStats[4],iStats[5],iStats[0], iStats[2],iStats[3],iStats[6],iStats[1])