fixed eval() errors