Fix indices issue.