Polishing -fix Remote Sync