diff --git a/avatar-mixer/src/main.cpp b/avatar-mixer/src/main.cpp
index e9fbda89df..82d75fa0fb 100644
--- a/avatar-mixer/src/main.cpp
+++ b/avatar-mixer/src/main.cpp
@@ -86,8 +86,8 @@ int main(int argc, char* argv[])
                     for (AgentList::iterator avatarAgent = agentList->begin();
                          avatarAgent != agentList->end();
                          avatarAgent++) {
-                        if ((*avatarAgent).getLinkedData() != NULL
-                            && !socketMatch(agentAddress, (*avatarAgent).getActiveSocket())) {
+                        if (avatarAgent->getLinkedData() != NULL
+                            && !socketMatch(agentAddress, avatarAgent->getActiveSocket())) {
                             currentBufferPosition = addAgentToBroadcastPacket(currentBufferPosition, &*avatarAgent);
                         }