fixing regexes