fix
fix evaluate vars