fixed duplicate saves