Bugfix to wildcard