fixing client and server