fixed regular expressions