fixed loading data