fixed eval code