diff --git a/owlps-positioner/src/autocalibration.cc b/owlps-positioner/src/autocalibration.cc
index dff62f5..a986871 100644
--- a/owlps-positioner/src/autocalibration.cc
+++ b/owlps-positioner/src/autocalibration.cc
@@ -252,9 +252,12 @@ void Autocalibration::compute_multi_packet_ss()
   const Measurement *rx_measurement = NULL ;
   vector<CalibrationRequest*>::const_iterator cr ;
   const string &rx_mac = rx->second.get_mac_addr() ;
-  for (cr = ref1_cr.begin() ; ! rx_measurement && cr != ref1_cr.end() ;
-       ++cr)
-    rx_measurement = (*cr)->get_measurement(rx_mac) ;
+  for (cr = ref1_cr.begin() ; cr != ref1_cr.end() ; ++cr)
+    {
+      rx_measurement = (*cr)->get_measurement(rx_mac) ;
+      if (rx_measurement)
+        break ;
+    }
 
   // The selected reference APs are in coverage of RX, therefore
   // we should always find a measurement of RX in ref1_rp