make the regex more rebust