diff --git a/include/boost/preprocessor/detail/expand.hpp b/include/boost/preprocessor/detail/expand.hpp
index 2fb8fff..9d5315e 100644
--- a/include/boost/preprocessor/detail/expand.hpp
+++ b/include/boost/preprocessor/detail/expand.hpp
@@ -11,6 +11,6 @@
  * See http://www.boost.org for most recent version.
  */
 
-#define BOOST_PP_DETAIL_EXPAND(X) BOOST_PP_DETAIL_EXPAND_DELAY(X)
-#define BOOST_PP_DETAIL_EXPAND_DELAY(X) X
+#define BOOST_PP_DETAIL_EXPAND(X) X
+#define BOOST_PP_DETAIL_EXPAND2(X,Y) BOOST_PP_DETAIL_EXPAND(X Y)
 #endif
diff --git a/include/boost/preprocessor/tuple/elem.hpp b/include/boost/preprocessor/tuple/elem.hpp
index bcc665f..54d836d 100644
--- a/include/boost/preprocessor/tuple/elem.hpp
+++ b/include/boost/preprocessor/tuple/elem.hpp
@@ -31,7 +31,7 @@ BOOST_PP_TUPLE_ELEM(2,1,(A,B))
   <li>BOOST_PP_LIMIT_TUPLE</li>
 </ul>
 */
-#define BOOST_PP_TUPLE_ELEM(SIZE_OF_TUPLE,INDEX,TUPLE) BOOST_PP_DETAIL_EXPAND(BOOST_PP_DETAIL_CAT2(BOOST_PP_TUPLE16_ELEM,INDEX) BOOST_PP_DETAIL_CAT2(BOOST_PP_TUPLE_ELEM_EX,SIZE_OF_TUPLE) TUPLE)
+#define BOOST_PP_TUPLE_ELEM(SIZE_OF_TUPLE,INDEX,TUPLE) BOOST_PP_DETAIL_EXPAND2(BOOST_PP_DETAIL_CAT2(BOOST_PP_TUPLE16_ELEM,INDEX),BOOST_PP_DETAIL_CAT2(BOOST_PP_TUPLE_ELEM_EX,SIZE_OF_TUPLE) TUPLE)
 
 #define BOOST_PP_TUPLE_ELEM_EX1(A) (A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P)
 #define BOOST_PP_TUPLE_ELEM_EX2(A,B) (A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P)