diff --git a/chat_commands/chat_commands.gsc b/chat_commands/chat_commands.gsc
index b3b07c0..da9e20c 100644
--- a/chat_commands/chat_commands.gsc
+++ b/chat_commands/chat_commands.gsc
@@ -497,11 +497,26 @@ FindPlayerByName(name)
         return self;
     }
     
+    matchs = 0;
+
     foreach (player in level.players)
     {
-        if (ToLower(player.name) == ToLower(name))
+        if( isSubStr( tolower( player.name), tolower(name ) ))
         {
-            return player;
+            matchs++;
+        }
+    }
+
+    wait 0.05;
+
+    if( matchs == 1)
+    {
+        foreach (player in level.players)
+        {
+            if( isSubStr( tolower( player.name), tolower(name ) ))
+            {
+                return player;
+            }
         }
     }
 }
@@ -739,4 +754,4 @@ DebugIsOn()
 PermissionIsEnabled()
 {
     return GetDvarInt("cc_permission_enabled");
-}
\ No newline at end of file
+}