Fixed data bug