Fixed NaN's in data reader