fixed save/update