diff --git a/src/chat/NetworkClient.java b/src/chat/NetworkClient.java
index 59231e6..7c04b6d 100644
--- a/src/chat/NetworkClient.java
+++ b/src/chat/NetworkClient.java
@@ -83,8 +83,13 @@ class ReceiveThread extends Thread {
 			            displayArea.append(message.getAuthor() + " has left the chat.\n");
 			            for(int i = 0;i < known_users.size();i ++)
 			            {
+			            	
 			            	if (known_users.get(i).getName().equals(message.getAuthor()))
-			            	known_users.remove(i);
+			            	{
+			            		known_users.remove(i);
+			            		break;
+			            		//System.out.println("Removing " + message.getAuthor());
+			            	}
 			            }
 			            knownUsersPanel.setText("");
 			            knownUsersPanel.append("Online:\n");