Fix changing manipulator