Fixed little issue with data saving