fix saving issue