diff --git a/TODO.t2t b/TODO.t2t
index e9f1986..9284fd8 100644
--- a/TODO.t2t
+++ b/TODO.t2t
@@ -180,7 +180,8 @@ Work to do in OwlPS
 
 == Known bugs ==
 
-- Cannot compute the error (Real) for autocalibration requests.
+- With autocalibration on, all the CPs declared in listeners.csv must
+  be in coverage or the reference points will not be generated.
 
 - Unit tests are currently unmaintained. Do not try to run them.
 
diff --git a/owlps-positioner/realposition.cc b/owlps-positioner/realposition.cc
index c39c129..004d3ee 100644
--- a/owlps-positioner/realposition.cc
+++ b/owlps-positioner/realposition.cc
@@ -28,10 +28,10 @@ Result RealPosition::compute(const Request &request)
   if (calibration_request != NULL)
     coordinates = static_cast<Point3D*>(
                     calibration_request->get_reference_point()) ;
+  else
+    coordinates = request.get_real_position() ;
 
-  coordinates = request.get_real_position() ;
   if (coordinates)
     return Result(&request, name, *coordinates) ;
-
   return Result(&request, name) ;
 }