Another index timing fix

Another index timing fix