Fixed to support EVAL and :exists