fixed save/update issue