Fixed an index order bug on the previous commit.