fixed abortMatch method