fix regexps to work everywhere