Fixed regular expression problems.