new fix to avoid match duplication