TEIID-2988: Fixing the  for zero based index
Merge pull request #369 from rareddy/TEIID-2988-8.7.x

TEIID-2988: Fixing the  for zero based index