Continue implementation of WorkflowService.
Bug fix