Fixed broken regexes