eval fix up