diff --git a/alib2data/src/std/visitor.hpp b/alib2data/src/std/visitor.hpp
index cf6119f0b14cb5df831fc9d7c905aa483b4c0d26..fbce28470437710b6048e80c77c5c82652d8edf0 100644
--- a/alib2data/src/std/visitor.hpp
+++ b/alib2data/src/std/visitor.hpp
@@ -99,7 +99,13 @@ public:
 
 	template<typename R, typename promoting_helper_type>
 	bool Visit1(void* userData, const T& first, const R& second) const {
-		return promoting_helper_type::tryPromote( userData, first, second, *this );
+		if(dynamic_cast<const T*>(&second)) {
+		//if(T::template typeId<T>() == second.selfTypeId()) { //TODO on g++-4.9 uncomment
+			this->Visit(userData, first, static_cast<const T&>(second));
+			return true;
+		} else {
+			return promoting_helper_type::tryPromote( userData, first, second, *this );
+		}
 	}
 };
 
@@ -115,7 +121,13 @@ public:
 
 	template<typename R, typename promoting_helper_type>
 	bool Visit1(void* userData, const T& first, const R& second) const {
-		return promoting_helper_type::tryPromote( userData, first, second, *this );
+		if(dynamic_cast<const T*>(&second)) {
+		//if(T::template typeId<T>() == second.selfTypeId()) { //TODO on g++-4.9 uncomment
+			this->Visit(userData, first, static_cast<const T&>(second));
+			return true;
+		} else {
+			return promoting_helper_type::tryPromote( userData, first, second, *this );
+		}
 	}
 };