Fix evaluator BUG