fix skipping matches, more brute-force search