client/client sync fixed