persistence storage fixed, untested yet