Fixed regular expression to include uniform arrays.