fix(movable): Fix issues introduced by previous commit