Fixed data management bug