Fixed double counting of evaluations