Fix chained tasks