maybe better condition for '@name'