fix duplicates bug on task 580