move eval(uneval()) to after the name check