A minor change on the regex that I prefer