Improving the matching a bit