Removing duplicates, bug fix