fixed hacky xml support