Duplicates issue fixed