Fixing to remove duplicates