TOTHAA-116
* fixing index out of range issue