Fixed issue wherein an array of size 3, index space:[0,2] was
accessing element at position 3 outside the array instead of 2.

Change-Id: Ic88a972fd0ace6cf7cc5c029dba331b0db9bfdd0