Fixed up de-duplication issues