Merge "Fix indexing issue."