fixed duplicates
fixed duplicates