Fix the syncing issue in the provider