bugfix eval engine