Make RegEx a little less naive