Fixed tasks bug