fixed save duplication issue