Fixing errors in Tasks. Testing required!