Fixed tasks model issue