Should have fixed all of the issues with duplicates