fix rpc calls