fix the sync issue