Fixed save raw datas bugs