fix data loading issue