add back duplication fixing