Fixed regular expression to get proper mathcing