Fixed bugs with task