bugfix: Match returns false positives, attempt 2

This actually finally fixes #5 in the right way.