diff --git a/owlps-positioner/calibrationrequest.cc b/owlps-positioner/calibrationrequest.cc
index 894f058..f254832 100644
--- a/owlps-positioner/calibrationrequest.cc
+++ b/owlps-positioner/calibrationrequest.cc
@@ -29,9 +29,9 @@ CalibrationRequest(uint_fast8_t _type):
 
 CalibrationRequest::
 CalibrationRequest(const Request &source,
-                   ReferencePoint *_reference_point = NULL,
-                   const Direction &_direction = Direction(),
-                   uint_fast8_t _type = OWL_REQUEST_AUTOCALIBRATION):
+                   ReferencePoint *_reference_point,
+                   const Direction &_direction,
+                   uint_fast8_t _type):
   Request(source), reference_point(_reference_point),
   direction(_direction)
 {
diff --git a/owlps-positioner/calibrationrequest.hh b/owlps-positioner/calibrationrequest.hh
index b62c4ab..76e6dfa 100644
--- a/owlps-positioner/calibrationrequest.hh
+++ b/owlps-positioner/calibrationrequest.hh
@@ -37,9 +37,9 @@ public:
     direction(source.direction) {}
 
   CalibrationRequest(const Request &source,
-                     ReferencePoint *_reference_point,
-                     const Direction &_direction,
-                     uint_fast8_t _type) ;
+                     ReferencePoint *_reference_point = NULL,
+                     const Direction &_direction = Direction(),
+                     uint_fast8_t _type = OWL_REQUEST_AUTOCALIBRATION) ;
 
   ~CalibrationRequest(void) {}