Fix split of tasks