Bugfix: do not match substrings (reported by russt)