Tasks ordering fixed