Fix for time/date sync