Fixed xml export