XML fix 2