Change the way with is handled (+ fix array eval)