fix eval_answer refactor regression