More correct context fudgery