fix the issue for persistance logic.