fixing persistence issue