Added a fix for errors in the tasks