fix typo and avoid wildcards