Fix persistent storage