Beter handling of wild cards