diff --git a/src/de/steamwar/bungeecore/SubserverSystem.java b/src/de/steamwar/bungeecore/SubserverSystem.java
index dc9fafaf..541889fd 100644
--- a/src/de/steamwar/bungeecore/SubserverSystem.java
+++ b/src/de/steamwar/bungeecore/SubserverSystem.java
@@ -85,18 +85,20 @@ public class SubserverSystem {
     }
 
     private static int freePort(int start){
-        int port = start;
-        boolean isFree = false;
-        while(!isFree){
-            port++;
-            isFree = true;
-            for(Subserver server : Subserver.getServerList()){
-                if(server.getServer().getAddress().getPort() == port){
-                    isFree = false;
-                    break;
+        synchronized (Subserver.getServerList()){
+            int port = start;
+            boolean isFree = false;
+            while(!isFree){
+                port++;
+                isFree = true;
+                for(Subserver server : Subserver.getServerList()){
+                    if(server.getServer().getAddress().getPort() == port){
+                        isFree = false;
+                        break;
+                    }
                 }
             }
+            return port;
         }
-        return port;
     }
 }
diff --git a/src/de/steamwar/bungeecore/listeners/mods/LabyMod.java b/src/de/steamwar/bungeecore/listeners/mods/LabyMod.java
index 43f12243..05949393 100644
--- a/src/de/steamwar/bungeecore/listeners/mods/LabyMod.java
+++ b/src/de/steamwar/bungeecore/listeners/mods/LabyMod.java
@@ -43,7 +43,6 @@ public class LabyMod extends BasicListener {
             return;
 
         Pair<Integer, String> value = readString(data, purpose.getKey());
-        BungeeCore.log(value.getValue());
         List<Mod> mods = new LinkedList<>();
 
         try{
@@ -56,7 +55,6 @@ public class LabyMod extends BasicListener {
         }
 
         Utils.handleMods(player, mods);
-        //TODO CCP & SHADOW
     }
 
     private Pair<Integer, String> readString(byte[] array, int startPos){