fixed duplicates