fixed on tasks duplication