fix the syncing issues