Fixed Incorrect Indexes