Issue #3. Fix direct wildcard match