Fix XML mapping