Fixed Saving of data