fixing RPC system