Another index timing fix