diff --git a/include/boost/function/function_base.hpp b/include/boost/function/function_base.hpp
index 527dcd4..f6dc45e 100644
--- a/include/boost/function/function_base.hpp
+++ b/include/boost/function/function_base.hpp
@@ -25,7 +25,7 @@
 #include <boost/type_traits.hpp>
 #include <boost/ref.hpp>
 
-#if defined(BOOST_MSVC) || defined(__MWERKS__)
+#if defined(BOOST_MSVC_STD_ITERATOR) || defined(__MWERKS__) && __MWERKS__ < 0x2406
 #  define BOOST_FUNCTION_TARGET_FIX(x) x
 #else
 #  define BOOST_FUNCTION_TARGET_FIX(x)