Fix wildcard matching