[E] Data Saving Bug Fixation

Bug in data saving has been found and fixed.