diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/InterimComponents/InterimAirdragType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/InterimComponents/InterimAirdragType.cs
index 04c33d01e7dfc7fc27589f8f9beee40ab0ec2cd5..03cb5a81197f94ba296ceb24d1a2747fdb924995 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/InterimComponents/InterimAirdragType.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/InterimComponents/InterimAirdragType.cs
@@ -72,16 +72,16 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
 			var retVal = new XElement(v24 + XMLNames.Component_AirDrag);
 				
 			var tmp = XElement.Load(inputData.XMLSource.ParentNode.CreateNavigator().ReadSubtree());
-			var dataElement = tmp.Elements().First(e => e.Name.LocalName == XMLNames.ComponentDataWrapper);
+			var dataElement = tmp.Descendants().Where(e => e.Name.LocalName == XMLNames.ComponentDataWrapper).First();
 			dataElement.Name =
 				v20 + XMLNames.ComponentDataWrapper;
 			dataElement.Add(new XAttribute("xmlns", inputData.DataSource.TypeVersion));
 
-			var signatureElement = tmp.Elements().First(e => e.Name.LocalName == XMLNames.DI_Signature);
-			signatureElement.Name = v20 + XMLNames.DI_Signature;
-			
+			var signatureElement = tmp.Descendants().Where(e => e.Name.LocalName == XMLNames.DI_Signature).First();
+            signatureElement.Name = v20 + XMLNames.DI_Signature;
 
-            retVal.Add(tmp.Elements());
+			
+            retVal.Add(dataElement, signatureElement);
 			return retVal;
         }