Fixed data persistence

Thanks William!