fixed data persistence issue