Deal with Sync issue