Time sync fix
Time sync logic improvement