fixed extractAndMatch
merging