Fixed duplication defect