fixed saving to one data form