Fixed individual saving of values