fix saving issues #112