Fixed datafile save issue