fix evaluate vars 2