fixed persistence issue