Fixing regexes again