added fix on tasks and models