make it work with old rpc client again