fixed save problems