Fix for the classname not appearing in the generated XML file...