Fix codeinvoker construct