diff --git a/infrastructure-centred/owlps-listener/owlps-listenerd.c b/infrastructure-centred/owlps-listener/owlps-listenerd.c
index 3d3dd39..3e6b91a 100644
--- a/infrastructure-centred/owlps-listener/owlps-listenerd.c
+++ b/infrastructure-centred/owlps-listener/owlps-listenerd.c
@@ -396,6 +396,7 @@ void check_configuration()
         fprintf(stderr, "No autocalibration IP specified, we will use"
                 " the aggregation IP as the destination of"
                 " autocalibration requests.\n") ;
+      SET_AUTOCALIBRATION_IP(GET_AGGREGATION_IP()) ;
     }
 
   // Port numbers //
@@ -450,7 +451,7 @@ void print_configuration()
 #ifdef USE_PTHREAD
           "keep_monitor = %s\n"
           "autocalibration = %s\n"
-          "autocalibration_ip = %s\n"
+          "autocalibration_ip = \"%s\"\n"
           "autocalibration_request_port = %"PRIuFAST16"\n"
           "autocalibration_port = %"PRIuFAST16"\n"
           "autocalibration_hello_delay = %"PRIuFAST32"\n"