diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java
index d6512a04..802e0519 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java
@@ -885,7 +885,7 @@ public class TFM_PlayerListener implements Listener
 
         try
         {
-            player.setPlayerListName(name.substring(0, 16));
+            player.setPlayerListName(StringUtils.substring(name, 0, 16));
         }
         catch (IllegalArgumentException ex)
         {