diff --git a/src/game/Group.cpp b/src/game/Group.cpp
index d55329051..6ccddb751 100644
--- a/src/game/Group.cpp
+++ b/src/game/Group.cpp
@@ -914,18 +914,18 @@ void Group::SetTargetIcon(uint8 id, uint64 whoGuid, uint64 targetGuid)
         return;
 
     // clean other icons
-    if( guid != 0 )
+    if( targetGuid != 0 )
         for(int i = 0; i < TARGETICONCOUNT; ++i)
-            if( m_targetIcons[i] == guid )
+            if( m_targetIcons[i] == targetGuid )
                 SetTargetIcon(i, 0, 0);
 
-    m_targetIcons[id] = guid;
+    m_targetIcons[id] = targetGuid;
 
     WorldPacket data(MSG_RAID_TARGET_UPDATE, (1+8+1+8));
     data << uint8(0);                                       // set targets
     data << uint64(whoGuid);
     data << uint8(id);
-    data << uint64(guid);
+    data << uint64(targetGuid);
     BroadcastPacket(&data, true);
 }