Remove wildcard so we can match