One more fix for incorrect indices.

Change-Id: I283f2f09cd0a17eefed4a763b08df856bbae76b3