fixing logic on evaluations