Fix duplication issues