Fixed up de-duplication issues
Merge