Fix: data saving