fixed XML mapping