r9164: Fix subcontext handling