diff --git a/gmdl-tools/monitor/src/main/java/eu/chorevolution/vsb/agent/MeasureAgent.java b/gmdl-tools/monitor/src/main/java/eu/chorevolution/vsb/agent/MeasureAgent.java
index 844bc3a9a63013e9e5dedc162fd48561608b65d8..350acc4c3fc59690f3f2ea98cc85b36474cd056e 100644
--- a/gmdl-tools/monitor/src/main/java/eu/chorevolution/vsb/agent/MeasureAgent.java
+++ b/gmdl-tools/monitor/src/main/java/eu/chorevolution/vsb/agent/MeasureAgent.java
@@ -91,7 +91,7 @@ public class MeasureAgent {
 		long localTimestamp_1 = clockSync.getAdjustedTime();
 		long ntpTimestamps = getTimestamp();
 		long localTimestamp_2 = clockSync.getAdjustedTime();
-		long deltaLocalTime = 	Math.round((localTimestamp_2 -localTimestamp_2)/2);
+		long deltaLocalTime = 	Math.round((localTimestamp_2 -localTimestamp_1)/2);
 		
 		setDeltaTime(ntpTimestamps - ( localTimestamp_1 + deltaLocalTime));
 	}
diff --git a/gmdl-tools/monitor/src/main/java/eu/chorevolution/vsb/clocksync/LocalTimeServer.java b/gmdl-tools/monitor/src/main/java/eu/chorevolution/vsb/clocksync/LocalTimeServer.java
index ee5db7ba8c52d3c0e2975a72a6a43034caed2a0e..b2ffd1e03477dfb23e16cb3b4d896dd20b65b1f2 100644
--- a/gmdl-tools/monitor/src/main/java/eu/chorevolution/vsb/clocksync/LocalTimeServer.java
+++ b/gmdl-tools/monitor/src/main/java/eu/chorevolution/vsb/clocksync/LocalTimeServer.java
@@ -48,7 +48,7 @@ public class LocalTimeServer extends Thread{
 			String sentence = new String( receivePacket.getData());
 			InetAddress IPAddress = receivePacket.getAddress();
 			int port = receivePacket.getPort();
-			String timestamp = ""+clockSync.getAdjustedTime()+"";
+			String timestamp = ""+System.currentTimeMillis()+"";
 			response = timestamp.getBytes();
 			System.out.println(" Receive request from "+IPAddress.getHostAddress());
 			DatagramPacket sendPacket = new DatagramPacket(response, response.length, IPAddress, port);