Bug fix on syncing. Bug fix on change pass