Make sure the last set time is stored in any case