diff --git a/autowiring/CoreContext.h b/autowiring/CoreContext.h
index 374c507f9..cdec6704e 100644
--- a/autowiring/CoreContext.h
+++ b/autowiring/CoreContext.h
@@ -673,11 +673,12 @@ class CoreContext:
   template<typename MemFn>
   InvokeRelay<MemFn> Invoke(MemFn memFn){
     typedef typename Decompose<MemFn>::type EventType;
+    typedef typename SelectTypeUnifier<EventType>::type UnifiedType;
 
     if (!std::is_same<AutowiringEvents,EventType>::value)
       GetGlobal()->Invoke(&AutowiringEvents::EventFired)(*this, typeid(EventType));
 
-    return MakeInvokeRelay(GetJunctionBox<EventType>(), memFn);
+    return MakeInvokeRelay(GetJunctionBox<UnifiedType>(), memFn);
   }
 
   /// <summary>
diff --git a/autowiring/JunctionBoxEntry.h b/autowiring/JunctionBoxEntry.h
index eb535729f..f173610bc 100644
--- a/autowiring/JunctionBoxEntry.h
+++ b/autowiring/JunctionBoxEntry.h
@@ -22,14 +22,12 @@ template<class T>
 struct JunctionBoxEntry:
   JunctionBoxEntryBase
 {
-  typedef typename SelectTypeUnifier<T>::type EntryType_t;
-  
   JunctionBoxEntry(CoreContext* owner, std::shared_ptr<T> ptr) :
     JunctionBoxEntryBase(owner),
-    m_ptr(autowiring::fast_pointer_cast<EntryType_t>(ptr))
+    m_ptr(ptr)
   {}
 
-  std::shared_ptr<EntryType_t> m_ptr;
+  std::shared_ptr<T> m_ptr;
 
   JunctionBoxEntry& operator=(const JunctionBoxEntry& rhs) {
     // This shouldn't be used. non-c++11 containers require this...