just for my interest: why no context.pop() here? (we didn't do it before this commit neither)