diff --git a/gtsam/nonlinear/Values.h b/gtsam/nonlinear/Values.h
index 57dec755b..459277dd7 100644
--- a/gtsam/nonlinear/Values.h
+++ b/gtsam/nonlinear/Values.h
@@ -395,7 +395,7 @@ namespace gtsam {
     static bool filterHelper(const boost::function<bool(Key)> filter, const ConstKeyValuePair& key_value) {
       BOOST_STATIC_ASSERT((!std::is_same<ValueType,Value>::value));
       // Filter and check the type
-      return filter(key_value.key) && (typeid(GenericValue<ValueType>) == typeid(key_value.value) );
+      return filter(key_value.key) && (dynamic_cast<const GenericValue<ValueType>*>(&key_value.value));
     }
 
     /** Serialization function */