Fix context mangling

The bf60a31e version was too greedy