Fixed data tracking issue;