diff --git a/ErgometerServer/ErgometerServer.csproj b/ErgometerServer/ErgometerServer.csproj
index c1a39b9..a5e6037 100644
--- a/ErgometerServer/ErgometerServer.csproj
+++ b/ErgometerServer/ErgometerServer.csproj
@@ -33,8 +33,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ErgometerLibrary">
-      <HintPath>..\..\ErgometerLibrary\ErgometerLibrary\bin\Debug\ErgometerLibrary.dll</HintPath>
+    <Reference Include="ErgometerLibrary, Version=1.0.2.1, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\ErgometerLibrary\ErgometerLibrary\ErgometerLibrary\bin\Debug\ErgometerLibrary.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/ErgometerServer/Server.cs b/ErgometerServer/Server.cs
index e779ef5..a73c594 100644
--- a/ErgometerServer/Server.cs
+++ b/ErgometerServer/Server.cs
@@ -24,6 +24,8 @@ namespace ErgometerServer
         {
             FileHandler.CheckDataFolder();
 
+            clients = new List<ClientThread>();
+
             TcpListener listener = new TcpListener(NetHelper.GetIP("127.0.0.1"), 8888);
             listener.Start();
 
@@ -37,7 +39,7 @@ namespace ErgometerServer
                 Console.WriteLine("Client connected");
 
                 //Start new client
-                var cl = new ClientThread(client, this);
+                ClientThread cl = new ClientThread(client, this);
                 clients.Add(cl);
 
                 //Run client on new thread