Change remote sync logic
[sync] 1.0.6.1