Finally fixed client-server sync.