fixing regular expressions