One more improvement to date synchronization