Fixed a serialization issue in EvalHandler