diff --git a/include/boost/type_traits/is_base_and_derived.hpp b/include/boost/type_traits/is_base_and_derived.hpp
index d5c93cf..3d926de 100644
--- a/include/boost/type_traits/is_base_and_derived.hpp
+++ b/include/boost/type_traits/is_base_and_derived.hpp
@@ -24,7 +24,11 @@ namespace boost {
 
 namespace detail {
 
-#if !defined(__BORLANDC__)
+#if !defined(__BORLANDC__) \
+ && !(defined(__EDG_VERSION__) && __EDG_VERSION__ <= 238)
+                             // The EDG version number is a lower estimate.
+                             // It is not currently known which EDG version
+                             // exactly fixes the problem.
 
 /*************************************************************************