Fix XStream mapping