+ fix saving data