RPC perf fix (thanks CSR!)