diff --git a/include/boost/phoenix/core/limits.hpp b/include/boost/phoenix/core/limits.hpp
index c40cb56..41ce38a 100644
--- a/include/boost/phoenix/core/limits.hpp
+++ b/include/boost/phoenix/core/limits.hpp
@@ -79,10 +79,12 @@
 
 #if !defined(BOOST_PROTO_MAX_ARITY)
 #   define BOOST_PROTO_MAX_ARITY BOOST_PP_INC(PHOENIX_COMPOSITE_LIMIT)
-#   if !defined(BOOST_MPL_LIMIT_METAFUNCTION_ARITY)
-#       define BOOST_MPL_LIMIT_METAFUNCTION_ARITY BOOST_PROTO_MAX_ARITY
-//#       define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
+#   if defined(BOOST_MPL_LIMIT_METAFUNCTION_ARITY)
+#       undef BOOST_MPL_LIMIT_METAFUNCTION_ARITY 
 #   endif
+#   define BOOST_MPL_LIMIT_METAFUNCTION_ARITY BOOST_PP_INC(BOOST_PROTO_MAX_ARITY)
+//#       define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
+//#   endif
 #elif (BOOST_PROTO_MAX_ARITY < PHOENIX_COMPOSE_LIMIT)
 #   error "BOOST_PROTO_MAX_ARITY < PHOENIX_COMPOSE_LIMIT"
 #endif