diff --git a/src/Orchard.Web/Core/Common/Drivers/BodyPartDriver.cs b/src/Orchard.Web/Core/Common/Drivers/BodyPartDriver.cs
index 572f73b12..5846becaf 100644
--- a/src/Orchard.Web/Core/Common/Drivers/BodyPartDriver.cs
+++ b/src/Orchard.Web/Core/Common/Drivers/BodyPartDriver.cs
@@ -59,9 +59,9 @@ namespace Orchard.Core.Common.Drivers {
         }
 
         protected override void Importing(BodyPart part, ContentManagement.Handlers.ImportContentContext context) {
-            var element = context.Element(part.PartDefinition.Name);
-            if (element != null) {
-                part.Text = element.Attribute("Text").Value;
+            var importedText = context.Attribute(part.PartDefinition.Name, "Text");
+            if (importedText != null) {
+                part.Text = importedText;
             }
         }
 
diff --git a/src/Orchard.Web/Core/Common/Drivers/TextFieldDriver.cs b/src/Orchard.Web/Core/Common/Drivers/TextFieldDriver.cs
index d3b6c8d0a..df2818cb1 100644
--- a/src/Orchard.Web/Core/Common/Drivers/TextFieldDriver.cs
+++ b/src/Orchard.Web/Core/Common/Drivers/TextFieldDriver.cs
@@ -37,9 +37,9 @@ namespace Orchard.Core.Common.Drivers {
         }
 
         protected override void Importing(ContentPart part, TextField field, ImportContentContext context) {
-            var element = context.Element(field.FieldDefinition.Name + "." + field.Name);
-            if (element != null) {
-                field.Value = element.Attribute("Text").Value;
+            var importedText = context.Attribute(field.FieldDefinition.Name + "." + field.Name, "Text");
+            if (importedText != null) {
+                field.Value = importedText;
             }
         }
 
diff --git a/src/Orchard/ContentManagement/Handlers/ImportContentContext.cs b/src/Orchard/ContentManagement/Handlers/ImportContentContext.cs
index 65b180350..a8689e989 100644
--- a/src/Orchard/ContentManagement/Handlers/ImportContentContext.cs
+++ b/src/Orchard/ContentManagement/Handlers/ImportContentContext.cs
@@ -9,8 +9,16 @@ namespace Orchard.ContentManagement.Handlers {
             Data = data;
         }
 
-        public XElement Element(string elementName) {
-            return Data.Element(elementName);
+        public string Attribute(string elementName, string attributeName) {
+            var element = Data.Element(elementName);
+            if (element != null) {
+                var attribute = element.Attribute(attributeName);
+                if (attribute != null)
+                    return attribute.Value;
+            }
+            return null;
         }
+
+
     }
 }
\ No newline at end of file