Now duplicates are fixed