Testing fix for missing xfwd support