Got rid of wildcard magic.