Updated regular expression again.