Fix TaskModel