diff --git a/src/main/java/it/polimi/ingsw/gc14/Network/TCP/Server/TCPServer.java b/src/main/java/it/polimi/ingsw/gc14/Network/TCP/Server/TCPServer.java
index 9c618ef..18551a3 100644
--- a/src/main/java/it/polimi/ingsw/gc14/Network/TCP/Server/TCPServer.java
+++ b/src/main/java/it/polimi/ingsw/gc14/Network/TCP/Server/TCPServer.java
@@ -205,7 +205,7 @@ public class TCPServer {
 
                             clientHandlers.add(handler);
                             connectedPlayers++;
-                            return;
+                            continue;
 
                         }
 
@@ -241,7 +241,7 @@ public class TCPServer {
 
                             clientHandlers.add(handler);
                             connectedPlayers++;
-                            return;
+                            continue;
 
                         }
                     }
diff --git a/src/main/java/it/polimi/ingsw/gc14/ServerLauncher.java b/src/main/java/it/polimi/ingsw/gc14/ServerLauncher.java
index 2138468..ff29627 100644
--- a/src/main/java/it/polimi/ingsw/gc14/ServerLauncher.java
+++ b/src/main/java/it/polimi/ingsw/gc14/ServerLauncher.java
@@ -195,6 +195,10 @@ public class ServerLauncher {
                         serverTCP.notifyAll(event);
                     }
                 }
+                else {
+                    serverRMI.notifyAll(event);
+                    serverTCP.notifyAll(event);
+                }
                 return !event.getIsError();
             }
         }