diff --git a/humanoid_modules/src/gripper_module.cpp b/humanoid_modules/src/gripper_module.cpp
index ef74911a1b4bad4cc9432caffc28cb0c209c65c2..31a9b89d9e272c81592aa9f5d7ed92aa63ddbfa1 100644
--- a/humanoid_modules/src/gripper_module.cpp
+++ b/humanoid_modules/src/gripper_module.cpp
@@ -114,9 +114,9 @@ void CGripperModule::reconfigure_callback(gripper_module::GripperModuleConfig &c
   this->assign_service.set_max_num_retries(config.service_max_retries);
   /* motion action parameters */
   this->gripper_action.set_max_num_retries(config.action_max_retries);
-  if (this->config.enable_timeout)
-    this->gripper_action.enable_timeout(config.feedback_watchdog_time_s);
-  else this->gripper_action.disable_timeout();
+  if (this->config.enable_watchdog)
+    this->gripper_action.enable_watchdog(config.feedback_watchdog_time_s);
+  else this->gripper_action.disable_watchdog();
   if(this->config.enable_timeout)
     this->gripper_action.enable_timeout(config.timeout_s);
   else
diff --git a/humanoid_modules/src/joints_cart_module.cpp b/humanoid_modules/src/joints_cart_module.cpp
index b055ea5f7ea904bf53e40bd6f70e004aec7e0281..95371782b9be15d67eb75e7698515a22b1479e54 100644
--- a/humanoid_modules/src/joints_cart_module.cpp
+++ b/humanoid_modules/src/joints_cart_module.cpp
@@ -142,7 +142,7 @@ void CJointsCartModule::reconfigure_callback(joints_cart_module::JointsCartModul
   this->get_ik_service.set_max_num_retries(config.get_ik_max_retries);
   /* motion action parameters */
   this->joints_action.set_max_num_retries(config.action_max_retries);
-  if (config.enable_watchdog)
+  if (this->config.enable_watchdog)
     this->joints_action.enable_watchdog(config.feedback_watchdog_time_s);
   else this->joints_action.disable_watchdog();
   if(this->config.enable_timeout)