diff --git a/lib/remote/configobjectutility.cpp b/lib/remote/configobjectutility.cpp
index 18b865b3c..a87cecf6f 100644
--- a/lib/remote/configobjectutility.cpp
+++ b/lib/remote/configobjectutility.cpp
@@ -130,8 +130,13 @@ bool ConfigObjectUtility::CreateObject(const Type::Ptr& type, const String& full
 
 	path += "/" + EscapeName(fullName) + ".conf";
 	
+	Dictionary::Ptr allAttrs = new Dictionary();
+	attrs->CopyTo(allAttrs);
+	nameParts->CopyTo(allAttrs);
+	allAttrs->Remove("name");
+
 	ConfigWriter::Ptr cw = new ConfigWriter(path);
-	cw->EmitConfigItem(type->GetName(), name, false, templates, attrs);
+	cw->EmitConfigItem(type->GetName(), name, false, templates, allAttrs);
 	cw->EmitRaw("\n");
 	
 	return true;