Fix lasts + add on index