Cleaner transition of time when restarting