diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/TFM_Command.java b/src/me/StevenLawson/TotalFreedomMod/Commands/TFM_Command.java
index b493e3e6..ba4d5828 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/TFM_Command.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/TFM_Command.java
@@ -36,6 +36,13 @@ public class TFM_Command
         List<Player> matches = server.matchPlayer(partialname);
         if (matches.isEmpty())
         {
+            for(Player p : server.getOnlinePlayers())
+            {
+                if(p.getDisplayName().toLowerCase().indexOf(partialname) != -1)
+                {
+                    return p;
+                }
+            }
             throw new CantFindPlayerException(partialname);
         }
         else