Attempt to improve matching.