fixed saving issues