Fix error with the hard coded regexps.