3 files changed, 28 insertions, 3 deletions

diff --git a/node_modules/montage/core/event/binding.js b/node_modules/montage/core/event/binding.js
index c31ee7f9..4206e1c2 100755
--- a/node_modules/montage/core/event/binding.js
+++ b/node_modules/montage/core/event/binding.js
@@ -257,9 +257,31 @@ var BindingDescriptor = exports.BindingDescriptor = Montage.create(Montage, /**
 });
 
 Serializer.defineSerializationUnit("bindings", function(object) {
-    var bindingDescriptors = object._bindingDescriptors;
+    var bindingDescriptors = object._bindingDescriptors,
+        bindingDescriptorsCopy;
+
+    // TODO: Hacked this function to create copy of object literal
+    // TODO: Remove when montage finds out how to identify object literals
+    // TODO: in a different way
+    function cloneObject(object, level) {
+        var clone = {};
+
+        for (var key in object) {
+            if (level > 0) {
+                clone[key] = cloneObject(object[key], level - 1);
+            } else {
+                clone[key] = object[key];
+            }
+        }
+
+        return clone;
+    }
 
     if (bindingDescriptors) {
+        if (Object.getPrototypeOf(bindingDescriptors) !== Object.prototype) {
+            bindingDescriptors = cloneObject(bindingDescriptors , 1);
+        }
+
         return bindingDescriptors;
     }
 });
diff --git a/node_modules/montage/core/serializer.js b/node_modules/montage/core/serializer.js
index 72543328..deadbc68 100755
--- a/node_modules/montage/core/serializer.js
+++ b/node_modules/montage/core/serializer.js
@@ -529,10 +529,10 @@ var Serializer = Montage.create(Montage, /** @lends module:montage/serializer.Se
                     return this._serializeElement(value);
                 } else if (Array.isArray(value)) {
                     return this._serializeArray(value, indent + 1);
-                } else if (Object.getPrototypeOf(value) === Object.prototype) {
-                    return this._serializeObjectLiteral(value, null, indent + 1);
                 } else if (value.constructor === Function) {
                     return this._serializeFunction(value, indent);
+                } else if (!("getInfoForObject" in value)) { // we consider object literals the ones who aren't a Montage object
+                    return this._serializeObjectLiteral(value, null, indent + 1);
                 } else {
                     // TODO: should refactor this to handle references here, doesn't make
                     //       sense to wait until it hits _serializeObject for that to happen
diff --git a/node_modules/montage/ui/application.js b/node_modules/montage/ui/application.js
index bbce6835..43443ecc 100755
--- a/node_modules/montage/ui/application.js
+++ b/node_modules/montage/ui/application.js
@@ -153,6 +153,9 @@ var Application = exports.Application = Montage.create(Montage, /** @lends monta
             // assign to the exports so that it is available in the deserialization of the template
             exports.application = self;
 
+            ///// TODO: Remove this hack when montage exposes this
+            this._template = template;
+
             template.instantiateWithOwnerAndDocument(null, window.document, function() {
                 require("ui/component").__root__.needsDraw = true;
                 if (callback) {