Fixed data loading issue