Fix var evaluations