Changed regular expression again