Use a more accurate regular expression