Bring back duplicate check