diff --git a/include/boost/preprocessor/control/limits/while_512.hpp b/include/boost/preprocessor/control/limits/while_512.hpp
index edd2866..e603fd9 100644
--- a/include/boost/preprocessor/control/limits/while_512.hpp
+++ b/include/boost/preprocessor/control/limits/while_512.hpp
@@ -18,7 +18,7 @@
 # include <boost/preprocessor/cat.hpp>
 # include <boost/preprocessor/config/config.hpp>
 # include <boost/preprocessor/debug/error.hpp>
-# include <boost/preprocessor/detail/auto_rec>
+# include <boost/preprocessor/detail/auto_rec.hpp>
 # include <boost/preprocessor/list/fold_left.hpp>
 # include <boost/preprocessor/list/fold_right.hpp>
 # include <boost/preprocessor/logical/bitand.hpp>
diff --git a/include/boost/preprocessor/detail/limits/auto_rec_512.hpp b/include/boost/preprocessor/detail/limits/auto_rec_512.hpp
index cdf91e8..069af17 100644
--- a/include/boost/preprocessor/detail/limits/auto_rec_512.hpp
+++ b/include/boost/preprocessor/detail/limits/auto_rec_512.hpp
@@ -244,7 +244,7 @@
 #                         define BOOST_PP_NODE_212(p) BOOST_PP_IIF(p(212), BOOST_PP_NODE_210, BOOST_PP_NODE_214)
 #                             define BOOST_PP_NODE_210(p) BOOST_PP_IIF(p(210), BOOST_PP_NODE_209, BOOST_PP_NODE_211)
 #                                 define BOOST_PP_NODE_209(p) BOOST_PP_IIF(p(209), 209, 210)
-*                                 define BOOST_PP_NODE_211(p) BOOST_PP_IIF(p(211), 211, 212)
+#                                 define BOOST_PP_NODE_211(p) BOOST_PP_IIF(p(211), 211, 212)
 #                             define BOOST_PP_NODE_214(p) BOOST_PP_IIF(p(214), BOOST_PP_NODE_213, BOOST_PP_NODE_215)
 #                                 define BOOST_PP_NODE_213(p) BOOST_PP_IIF(p(213), 213, 214)
 #                                 define BOOST_PP_NODE_215(p) BOOST_PP_IIF(p(215), 215, 216)
@@ -499,7 +499,7 @@
 #                         define BOOST_PP_NODE_468(p) BOOST_PP_IIF(p(468), BOOST_PP_NODE_466, BOOST_PP_NODE_470)
 #                             define BOOST_PP_NODE_466(p) BOOST_PP_IIF(p(466), BOOST_PP_NODE_465, BOOST_PP_NODE_467)
 #                                 define BOOST_PP_NODE_465(p) BOOST_PP_IIF(p(465), 465, 466)
-*                                 define BOOST_PP_NODE_467(p) BOOST_PP_IIF(p(467), 467, 468)
+#                                 define BOOST_PP_NODE_467(p) BOOST_PP_IIF(p(467), 467, 468)
 #                             define BOOST_PP_NODE_470(p) BOOST_PP_IIF(p(470), BOOST_PP_NODE_469, BOOST_PP_NODE_471)
 #                                 define BOOST_PP_NODE_469(p) BOOST_PP_IIF(p(469), 469, 470)
 #                                 define BOOST_PP_NODE_471(p) BOOST_PP_IIF(p(471), 471, 472)
diff --git a/include/boost/preprocessor/list/limits/fold_left_512.hpp b/include/boost/preprocessor/list/limits/fold_left_512.hpp
index bd4e806..b2a9bca 100644
--- a/include/boost/preprocessor/list/limits/fold_left_512.hpp
+++ b/include/boost/preprocessor/list/limits/fold_left_512.hpp
@@ -28,7 +28,7 @@
 #
 # define BOOST_PP_LIST_FOLD_LEFT BOOST_PP_CAT(BOOST_PP_LIST_FOLD_LEFT_, BOOST_PP_AUTO_REC(BOOST_PP_WHILE_P, 512))
 #
-# define BOOST_PP_LIST_FOLD_LEFT_257(o, s, l) BOOST_PP_ERROR(0x0004)
+# define BOOST_PP_LIST_FOLD_LEFT_513(o, s, l) BOOST_PP_ERROR(0x0004)
 #
 # define BOOST_PP_LIST_FOLD_LEFT_D(d, o, s, l) BOOST_PP_LIST_FOLD_LEFT_ ## d(o, s, l)
 # define BOOST_PP_LIST_FOLD_LEFT_2ND BOOST_PP_LIST_FOLD_LEFT
diff --git a/include/boost/preprocessor/list/limits/fold_right_512.hpp b/include/boost/preprocessor/list/limits/fold_right_512.hpp
index 3ef5159..10a471e 100644
--- a/include/boost/preprocessor/list/limits/fold_right_512.hpp
+++ b/include/boost/preprocessor/list/limits/fold_right_512.hpp
@@ -26,7 +26,7 @@
 #
 # define BOOST_PP_LIST_FOLD_RIGHT BOOST_PP_CAT(BOOST_PP_LIST_FOLD_RIGHT_, BOOST_PP_AUTO_REC(BOOST_PP_WHILE_P, 512))
 #
-# define BOOST_PP_LIST_FOLD_RIGHT_257(o, s, l) BOOST_PP_ERROR(0x0004)
+# define BOOST_PP_LIST_FOLD_RIGHT_513(o, s, l) BOOST_PP_ERROR(0x0004)
 #
 # define BOOST_PP_LIST_FOLD_RIGHT_D(d, o, s, l) BOOST_PP_LIST_FOLD_RIGHT_ ## d(o, s, l)
 # define BOOST_PP_LIST_FOLD_RIGHT_2ND BOOST_PP_LIST_FOLD_RIGHT
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 42475a5..2a36f9a 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -73,6 +73,25 @@ alias preprocessor_nvm
         [ compile tuple.cpp : <define>BOOST_PP_VARIADICS=0 : tuple_nvm ]
   ;
 
+alias preprocessor_number_512
+   :   
+        [ compile arithmetic.cpp : <define>BOOST_PP_LIMIT_MAG=512 : arithmetic_num ]
+        [ compile array.cpp : <define>BOOST_PP_LIMIT_MAG=512 : array_num ]
+        [ compile comparison.cpp : <define>BOOST_PP_LIMIT_MAG=512 : comparison_num ]
+        [ compile control.cpp : <define>BOOST_PP_LIMIT_MAG=512 : control_num ]
+        [ compile debug.cpp : <define>BOOST_PP_LIMIT_MAG=512 : debug_num ]
+        [ compile facilities.cpp : <define>BOOST_PP_LIMIT_MAG=512 : facilities_num ]
+        [ compile iteration.cpp : <define>BOOST_PP_LIMIT_MAG=512 : iteration_num ]
+        [ compile list.cpp : <define>BOOST_PP_LIMIT_MAG=512 : list_num ]
+        [ compile logical.cpp : <define>BOOST_PP_LIMIT_MAG=512 : logical_num ]
+        [ compile repetition.cpp : <define>BOOST_PP_LIMIT_MAG=512 : repetition_num ]
+        [ compile selection.cpp : <define>BOOST_PP_LIMIT_MAG=512 : selection_num ]
+        [ compile seq.cpp : <define>BOOST_PP_LIMIT_MAG=512 : seq_num ]
+        [ compile slot.cpp : <define>BOOST_PP_LIMIT_MAG=512 : slot_num ]
+        [ compile stringize.cpp : <define>BOOST_PP_LIMIT_MAG=512 : stringize_num ]
+        [ compile tuple.cpp : <define>BOOST_PP_LIMIT_MAG=512 : tuple_num ]
+  ;
+
 alias preprocessor_c
    :   
         [ compile arithmetic.c 
diff --git a/test/arithmetic.cxx b/test/arithmetic.cxx
index 5d48928..d375f62 100644
--- a/test/arithmetic.cxx
+++ b/test/arithmetic.cxx
@@ -65,12 +65,32 @@ BEGIN BOOST_PP_MOD(5, BOOST_PP_MOD(4, 3)) == 0 END
 
 BEGIN BOOST_PP_INC(0) == 1 END
 BEGIN BOOST_PP_INC(22) == 23 END
+
+#if BOOST_PP_LIMIT_MAG > 256
+
+BEGIN BOOST_PP_INC(256) == 257 END
+
+#else
+
 BEGIN BOOST_PP_INC(256) == 256 END
 
+#endif
+
 BEGIN BOOST_PP_INC(BOOST_PP_INC(0)) == 2 END
 BEGIN BOOST_PP_INC(BOOST_PP_INC(17)) == 19 END
+
+#if BOOST_PP_LIMIT_MAG > 256
+
+BEGIN BOOST_PP_INC(BOOST_PP_INC(255)) == 257 END
+
+#else
+
 BEGIN BOOST_PP_INC(BOOST_PP_INC(255)) == 256 END
 
+#endif
+
+
+
 /* decrement */
 
 BEGIN BOOST_PP_DEC(256) == 255 END