1 files changed, 6 insertions, 8 deletions

diff --git a/node_modules/montage/core/event/event-manager.js b/node_modules/montage/core/event/event-manager.js
index bef8a67c..75272f85 100755
--- a/node_modules/montage/core/event/event-manager.js
+++ b/node_modules/montage/core/event/event-manager.js
@@ -103,13 +103,12 @@ var EventListenerDescriptor = Montage.create(Montage, {
     }
 });
 
-Serializer.defineSerializationUnit("listeners", function(object) {
+Serializer.defineSerializationUnit("listeners", function(object, serializer) {
     var eventManager = defaultEventManager,
         uuid = object.uuid,
         eventListenerDescriptors = [],
         descriptors,
         descriptor,
-        listenerDescriptor,
         listener;
 
     for (var type in eventManager.registeredEventListeners) {
@@ -119,12 +118,11 @@ Serializer.defineSerializationUnit("listeners", function(object) {
             for (var listenerUuid in descriptor.listeners) {
                 listener = descriptor.listeners[listenerUuid];
 
-                eventListenerDescriptor = EventListenerDescriptor.create();
-                eventListenerDescriptor.type = type;
-                eventListenerDescriptor.listener = listener.listener;
-                eventListenerDescriptor.capture = listener.capture;
-
-                eventListenerDescriptors.push(eventListenerDescriptor);
+                eventListenerDescriptors.push({
+                    type: type,
+                    listener: serializer.addObjectReference(listener.listener),
+                    capture: listener.capture
+                });
             }
         }
     }