diff --git a/matchBrowser/src/main/java/networkInterface/NetworkInterface.java b/matchBrowser/src/main/java/networkInterface/NetworkInterface.java
index 241da0f4..431cdd84 100644
--- a/matchBrowser/src/main/java/networkInterface/NetworkInterface.java
+++ b/matchBrowser/src/main/java/networkInterface/NetworkInterface.java
@@ -66,14 +66,14 @@ public class NetworkInterface {
                     if(game != null) {
                         games.add(game);
                     }
-                }
-                HostedGamesRequestEncoder encoder = new HostedGamesRequestEncoder();
-                try {
-                    byte[] message = encoder.encode(new HostGamesRequest(games));
-                    System.out.println(LocalDateTime.now() + ": Sending " + games.size() + " game/s");
-                    serverSocket.send(new DatagramPacket(message, message.length, groupAddress, groupPort));
-                } catch (InvalidMessageException | IOException e) {
-                    e.printStackTrace();
+                    HostedGamesRequestEncoder encoder = new HostedGamesRequestEncoder();
+                    try {
+                        byte[] message = encoder.encode(new HostGamesRequest(games));
+                        System.out.println(LocalDateTime.now() + ": Sending " + games.size() + " game/s");
+                        serverSocket.send(new DatagramPacket(message, message.length, groupAddress, groupPort));
+                    } catch (InvalidMessageException | IOException e) {
+                        e.printStackTrace();
+                    }
                 }
             }
         }, period, period);
@@ -97,6 +97,9 @@ public class NetworkInterface {
             DatagramPacket receivePacket = new DatagramPacket(receiveData, receiveData.length);
             serverSocket.receive(receivePacket);
 
+            System.out.println(receivePacket.getAddress());
+            System.out.println(this.clientsAddresses);
+
             BinaryMessageDecoder messageDecoder = new BinaryMessageDecoder(receivePacket.getData());
             switch (MessageType.fromByte(messageDecoder.getHeaderMessageType())){
                 case HOST_GAME:
diff --git a/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java b/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java
index 84d82e91..ba533551 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java
@@ -188,6 +188,7 @@ public class KeyBindingsController {
             loadNotification("One or more key bindings are missing. " +
                     "Failed to save.", true);
         }
+        ((Stage)btnCancel.getScene().getWindow()).close();
     }
 
     /**