1 files changed, 7 insertions, 0 deletions

diff --git a/node_modules/tools/template/template-creator.js b/node_modules/tools/template/template-creator.js
index 4ba1b443..01a2518b 100755
--- a/node_modules/tools/template/template-creator.js
+++ b/node_modules/tools/template/template-creator.js
@@ -35,6 +35,7 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
             var serializer = this.serializer,
                 objects = {},
                 components = {},
+                componentsChildComponents = {},
                 doc,
                 script,
                 self = this;
@@ -54,6 +55,8 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
                     label = self._generateLabelForComponent(component, Object.keys(components));
                     component._element = targetNode;
                     components[label] = component;
+                    componentsChildComponents[label] = component.childComponents;
+                    delete component.childComponents;
                 } else {
                     for (var i = 0; (childNode = childNodes[i]); i++) {
                         targetChildNode = targetNode.appendChild(childNode.cloneNode(false));
@@ -84,6 +87,10 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
             
             copyNode(body, this._document.body, true);
             this._ownerSerialization = serializer.serialize(components);
+            for (var label in components) {
+                components[label].childComponents = componentsChildComponents[label];
+            }
+            components = componentsChildComponents = null;
             this._externalObjects = serializer.getExternalObjects();
             
             return this;