Merge "Fix incorrect indexing"