minor change to regexes