Fixed saving of data