Fixing manual work unit creation