Changed the regex again, and changed it in the core validations