client state sync fix