fixes #1666 correct index mapping problem

Change-Id: I1b0507f5708851b63947fff2537d260fa874a349