fix data loading