expression eval fix