Trying to fix persistent storage issue