fixing issues with finishing a task