Feature/workflow fix