rpc_server: fixing #1