Propper XML fix