FIxing indexes