Fix an issue with XML format sometimes