fix initial data loading issue