fixed regular expression, modified use indexing base