Fixed JAXB bug