Fixed some data reading