Fixed Incorrect Indexing