Fixed client/server code.