update the default behavior of the RPC support