Fixed issue with persistent storage