Make the regex more strict