diff --git a/scripts/container/dcall-dup2-client b/scripts/container/dcall-dup2-client
index 530f66d..9f0fff9 100755
--- a/scripts/container/dcall-dup2-client
+++ b/scripts/container/dcall-dup2-client
@@ -11,7 +11,7 @@ donar \
   -r 5000 \
 > $3/log/client-donar-stdout.log 2> $3/log/client-donar-stderr.log &
 
-measlat -h 127.13.3.7 -p 5000 -c 2 \
+measlat -h 127.13.3.7 -p 5000 -c 1 \
 > $4/log/client-measboot-stdout.log 2> $4/log/client-measboot-stderr.log 
 sleep 10
 
diff --git a/scripts/container/dcall-dup2-server b/scripts/container/dcall-dup2-server
index 94e0d88..5d51bea 100755
--- a/scripts/container/dcall-dup2-server
+++ b/scripts/container/dcall-dup2-server
@@ -11,7 +11,7 @@ donar \
   -r 5000 \
 > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log &
 
-measlat -l -h 127.0.0.1 -p 5000 -r -c 2 \
+measlat -l -h 127.0.0.1 -p 5000 -r -c 1 \
 > ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log &
 sleep 10
 
diff --git a/scripts/container/dcall-dup2-server-single b/scripts/container/dcall-dup2-server-single
index 53df1e2..e11796f 100755
--- a/scripts/container/dcall-dup2-server-single
+++ b/scripts/container/dcall-dup2-server-single
@@ -12,7 +12,7 @@ donar \
   -r 5000 \
 > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log &
 
-measlat -l -h 127.0.0.1 -p 5000 -r -c 2 \
+measlat -l -h 127.0.0.1 -p 5000 -r -c 1 \
 > ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log &
 sleep 10
 
diff --git a/scripts/container/dcall-lightning-client b/scripts/container/dcall-lightning-client
index 1bd7e16..ecfe17c 100755
--- a/scripts/container/dcall-lightning-client
+++ b/scripts/container/dcall-lightning-client
@@ -12,7 +12,7 @@ donar \
   -r 5000 \
 > $4/log/client-donar-stdout.log 2> $4/log/client-donar-stderr.log &
 
-measlat -h 127.13.3.7 -p 5000 -c 2 \
+measlat -h 127.13.3.7 -p 5000 -c 1 \
 > $4/log/client-measboot-stdout.log 2> $4/log/client-measboot-stderr.log 
 sleep 10
 
diff --git a/scripts/container/dcall-lightning-server b/scripts/container/dcall-lightning-server
index 663fac0..02af367 100755
--- a/scripts/container/dcall-lightning-server
+++ b/scripts/container/dcall-lightning-server
@@ -12,7 +12,7 @@ donar \
   -r 5000 \
 > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log &
 
-measlat -l -h 127.0.0.1 -p 5000 -r -c 2 \
+measlat -l -h 127.0.0.1 -p 5000 -r -c 1 \
 > ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log &
 sleep 10
 
diff --git a/scripts/container/dcall-lightning-server-single b/scripts/container/dcall-lightning-server-single
index adff8d9..ec37771 100755
--- a/scripts/container/dcall-lightning-server-single
+++ b/scripts/container/dcall-lightning-server-single
@@ -13,7 +13,7 @@ donar \
   -r 5000 \
 > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log &
 
-measlat -l -h 127.0.0.1 -p 5000 -r -c 2 \
+measlat -l -h 127.0.0.1 -p 5000 -r -c 1 \
 > ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log &
 sleep 10
 
diff --git a/scripts/container/dcall-simple-client b/scripts/container/dcall-simple-client
index f279d23..9a7214f 100755
--- a/scripts/container/dcall-simple-client
+++ b/scripts/container/dcall-simple-client
@@ -11,7 +11,7 @@ donar \
   -r 5000 \
 > $3/log/client-donar-stdout.log 2> $3/log/client-donar-stderr.log &
 
-measlat -h 127.13.3.7 -p 5000 -c 2 \
+measlat -h 127.13.3.7 -p 5000 -c 1 \
 > $4/log/client-measboot-stdout.log 2> $4/log/client-measboot-stderr.log 
 sleep 10
 
diff --git a/scripts/container/dcall-simple-server b/scripts/container/dcall-simple-server
index d8184a9..99cd59d 100755
--- a/scripts/container/dcall-simple-server
+++ b/scripts/container/dcall-simple-server
@@ -11,7 +11,7 @@ donar \
   -r 5000 \
 > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log &
 
-measlat -l -h 127.0.0.1 -p 5000 -r -c 2 \
+measlat -l -h 127.0.0.1 -p 5000 -r -c 1 \
 > ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log &
 sleep 10
 
diff --git a/scripts/container/dcall-simple-server-single b/scripts/container/dcall-simple-server-single
index fb2560f..22930bd 100755
--- a/scripts/container/dcall-simple-server-single
+++ b/scripts/container/dcall-simple-server-single
@@ -11,7 +11,7 @@ donar \
   -r 5000 \
 > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log &
 
-measlat -l -h 127.0.0.1 -p 5000 -r -c 2 \
+measlat -l -h 127.0.0.1 -p 5000 -r -c 1 \
 > ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log &
 sleep 10
 
diff --git a/src/meas_lat.c b/src/meas_lat.c
index a8ff328..985c645 100644
--- a/src/meas_lat.c
+++ b/src/meas_lat.c
@@ -115,6 +115,12 @@ int on_receive_measure_packet(struct evt_core_ctx* ctx, struct evt_core_fdinfo*
     register_timer (ctx, &next_tick);
   }
 
+  struct measure_packet* head = (struct measure_packet*) mctx->mc.payload_rcv;
+  if ((!mctx->mc.is_server || mctx->mc.is_rtt) && head->counter >= mctx->mc.max_measure) {
+    printf("Measurement done\n");
+    exit(EXIT_SUCCESS);
+  }
+
   return 0;
 }
 
diff --git a/src/measure.c b/src/measure.c
index b05ee27..b91cfa3 100644
--- a/src/measure.c
+++ b/src/measure.c
@@ -43,11 +43,6 @@ void measure_parse(int size, struct measure_conf* mc) {
     is_slow,
     link_id,
     is_vanilla);
-
-  if ((!mc->is_server || mc->is_rtt) && head->counter >= mc->max_measure) {
-    printf("Measurement done\n");
-    exit(EXIT_SUCCESS);
-  }
 }
 
 void measure_prepare(struct measure_conf* mc) {