Fix issue with time and data. Are stored after the setting