Use flag instead of name check.