rpc fixing