Fix the regex to work better