Fix data path