fix regexps again