Fix data index