#5 fixed duplicates creating