Fix loading data for estimate calculation