minor change, use GetClient