fixup regex-matching