Fixing a bit of RPC.