Manipulator fix