Fixing an issue on the XML save