diff --git a/src/dynamic_graph/sot/dynamics/solver.py b/src/dynamic_graph/sot/dynamics/solver.py
index 3678c6901acd1636f294602fb25d19e8c57723d0..1be5988b798546111fbaa6c5d8da98ad521cb95b 100644
--- a/src/dynamic_graph/sot/dynamics/solver.py
+++ b/src/dynamic_graph/sot/dynamics/solver.py
@@ -43,11 +43,7 @@ class Solver:
         # and NOT 'sot.control'!
 
         if robot.device:
-            plug(self.sot.control, robot.device.control)
-
-            #FIXME: should be...
-            # plug(self.jointLimitator.control, robot.device.control)
-
+            plug(self.jointLimitator.control, robot.device.control)
             plug(self.robot.device.state, self.robot.dynamic.position)
 
     def push(self, taskName):