diff --git a/src/main/java/net/krakatoa/proxy/command/SendTestMessageCommand.java b/src/main/java/net/krakatoa/proxy/command/SendTestMessageCommand.java
index b06a722..4548ede 100644
--- a/src/main/java/net/krakatoa/proxy/command/SendTestMessageCommand.java
+++ b/src/main/java/net/krakatoa/proxy/command/SendTestMessageCommand.java
@@ -52,7 +52,7 @@ public class SendTestMessageCommand extends Command {
 
           kraSocketClientProtocolMessage = new KraSocketClientProtocolMessage(
               status, (byte) cmdID, Integer.parseInt(args[2]),
-              proxiedPlayer.getUniqueId().toString(), Integer.parseInt(args[3]), args[4],
+              proxiedPlayer.getUniqueId(), Integer.parseInt(args[3]), args[4],
               consumer);
 
           ProxySystem.getInstance().getKraSocketClient().getSocketClient()
diff --git a/src/main/java/net/krakatoa/proxy/listener/PostLoginListener.java b/src/main/java/net/krakatoa/proxy/listener/PostLoginListener.java
index c9e8b93..2fb758a 100644
--- a/src/main/java/net/krakatoa/proxy/listener/PostLoginListener.java
+++ b/src/main/java/net/krakatoa/proxy/listener/PostLoginListener.java
@@ -7,6 +7,7 @@ import earth.krakatao.protocol.KraSocketClientProtocolDest;
 import earth.krakatao.protocol.KraSocketClientProtocolMessage;
 import earth.krakatao.protocol.KraSocketClientProtocolStatus;
 import java.security.SecureRandom;
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 import net.krakatoa.proxy.ProxySystem;
@@ -93,7 +94,7 @@ public class PostLoginListener implements Listener {
             ProxySystem.getInstance().getKraSocketClient().getSocketClient()
                 .SendMessage(new KraSocketClientProtocolMessage(
                     KraSocketClientProtocolStatus.GET.getStatus(), cmdID,
-                    KraSocketClientProtocolDest.BACKEND.getStatus(), uuid,
+                    KraSocketClientProtocolDest.BACKEND.getStatus(), UUID.fromString(uuid),
                     (short) 10, "", consumer));
           }
         });
diff --git a/src/main/java/net/krakatoa/proxy/listener/SocketClientMessageListener.java b/src/main/java/net/krakatoa/proxy/listener/SocketClientMessageListener.java
index 58f39b9..8fe2d7c 100644
--- a/src/main/java/net/krakatoa/proxy/listener/SocketClientMessageListener.java
+++ b/src/main/java/net/krakatoa/proxy/listener/SocketClientMessageListener.java
@@ -14,7 +14,6 @@ import earth.krakatao.protocol.KraSocketClientProtocolMessage;
 import earth.krakatao.protocol.KraSocketClientProtocolStatus;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import net.krakatoa.proxy.ProxySystem;
 import net.md_5.bungee.api.ProxyServer;
@@ -170,7 +169,7 @@ public class SocketClientMessageListener implements KraSocketClientEventInterfac
         ProxyServer.getInstance().getScheduler().runAsync(ProxySystem.getInstance(), () -> {
 
           ProxiedPlayer proxiedPlayer = ProxySystem.getInstance().getProxy()
-              .getPlayer(UUID.fromString(kraProtocolMessage.getUuid()));
+              .getPlayer(kraProtocolMessage.getUuid());
 
           if (proxiedPlayer != null) {
             if (kraProtocolMessage.getCmdNumber() == 13337) {