Fixing for XML format