Fixed regular expression to support any value