Fix data reader