fixed multiple-save issues