fixing the tasks