Fix issue with prsistent storage