Make regular expression stricter