XVA: Fix error in stage2

Fixes #25