XML fallback path now working nicely.