Fix save data collection