Trying to fix data persistence.