Fixed more indexes