Fix for save duplication #1