Fixed create task issues