XML output fixed