fixes RPC client/server