change to semantics of currentContext()