Fix client, which was rewrote
Fix server, which was rewrote