finally fixed saving