Fixied duplicates issue