Fix wildcard resolving