Quick & Dirty fix for triangulation with TPL context, part 2