Fix loading data method