diff --git a/src/engine/objects/PlayerCharacter.java b/src/engine/objects/PlayerCharacter.java
index e11dd8e9..bd2bda46 100644
--- a/src/engine/objects/PlayerCharacter.java
+++ b/src/engine/objects/PlayerCharacter.java
@@ -183,6 +183,8 @@ public class PlayerCharacter extends AbstractCharacter {
 
     public PlayerCombatStats combatStats;
 
+    public Integer selectedUUID = 0;
+
     /**
      * No Id Constructor
      */
diff --git a/src/engine/util/KeyCloneAudit.java b/src/engine/util/KeyCloneAudit.java
index e5470e3b..1ee08aaf 100644
--- a/src/engine/util/KeyCloneAudit.java
+++ b/src/engine/util/KeyCloneAudit.java
@@ -18,7 +18,7 @@ public enum KeyCloneAudit {
 
     public static boolean auditChatMsg(PlayerCharacter pc, String message) {
 
-        if(pc.combatTarget != null && message.contains(String.valueOf(pc.combatTarget.getObjectUUID()))) {
+        if(message.contains(String.valueOf(pc.selectedUUID))) {
             //targeting software detected
 
             Group g = GroupManager.getGroup(pc);
@@ -64,11 +64,16 @@ public enum KeyCloneAudit {
         try {
             TargetObjectMsg tarMsg = (TargetObjectMsg) msg;
             ClientConnection origin = (ClientConnection) msg.getOrigin();
+
             long now = System.currentTimeMillis();
 
             if (tarMsg.getTargetType() != MBServerStatics.MASK_PLAYER)
                 return;
 
+            PlayerCharacter pc = origin.getPlayerCharacter();
+            pc.selectedUUID = ((TargetObjectMsg) msg).getTargetID();
+
+
             if (System.currentTimeMillis() > origin.finalStrikeRefresh) {
                 origin.lastStrike = System.currentTimeMillis();
                 origin.strikes = 0;