diff --git a/Navigator/src/Navigator/Events/Event.h b/Navigator/src/Navigator/Events/Event.h
index 7e7b303..3a2413d 100644
--- a/Navigator/src/Navigator/Events/Event.h
+++ b/Navigator/src/Navigator/Events/Event.h
@@ -47,21 +47,18 @@ namespace Navigator {
 
 	class NAV_API EventDispatcher
 	{
-		template<typename T>
-			using EventFunc = std::function<bool(T&)>;
-
 	public:
 		EventDispatcher(Event& e) :
 			m_event(e)
 		{
 		}
 
-		template<typename T>
-		bool Dispatch(EventFunc<T> function)
+		template<typename T, typename  F>
+		bool Dispatch(const F& function)
 		{
 			if(m_event.GetEventType() == T::GetStaticType())
 			{
-				m_event.handledFlag = function(*(T*)&m_event);
+				m_event.handledFlag = function(static_cast<T&>(m_event));
 				return true;
 			}
 			else
diff --git a/Navigator/src/Navigator/NavCore.h b/Navigator/src/Navigator/NavCore.h
index 7a7ea64..dedd18b 100644
--- a/Navigator/src/Navigator/NavCore.h
+++ b/Navigator/src/Navigator/NavCore.h
@@ -16,6 +16,6 @@
 //Bit field setter
 #define BIT(x) (1<<x)
 
-#define BIND_EVENT_FUNCTION(x) std::bind(&x, this, std::placeholders::_1)
+#define BIND_EVENT_FUNCTION(x) [this](auto&&... args) -> decltype(auto) { return this->x(std::forward<decltype(args)>(args)...); }
 
 #endif