FIX: issue #348 (WITH not CONTEXT aware)