Added in a check to preserve WorkflowState