fixed duplicates issue