Fixed the bugs with data saving