Major bug fix, do not match substrings!