eval fix

calvin's eval fix