diff --git a/include/boost/fusion/adapted/struct/adapt_assoc_struct.hpp b/include/boost/fusion/adapted/struct/adapt_assoc_struct.hpp
index e621187f..c355d4b3 100644
--- a/include/boost/fusion/adapted/struct/adapt_assoc_struct.hpp
+++ b/include/boost/fusion/adapted/struct/adapt_assoc_struct.hpp
@@ -53,7 +53,7 @@ namespace boost { namespace fusion { namespace extension {
 // SEQ_FOR_EACH_I to generate the "linear" substructures.
 // Thanks to Paul Mensonides for the PP macro help
 
-#define BOOST_FUSION_ADAPT_ASSOC_STRUCT_I(name, seq)                                  \
+#define BOOST_FUSION_ADAPT_ASSOC_STRUCT_I(name, seq)                            \
     namespace boost { namespace fusion { namespace traits                       \
     {                                                                           \
         template <>                                                             \
@@ -66,11 +66,11 @@ namespace boost { namespace fusion { namespace extension {
     {                                                                           \
         template <>                                                             \
         struct struct_size<name> : mpl::int_<BOOST_PP_SEQ_SIZE(seq)> {};        \
-        BOOST_PP_SEQ_FOR_EACH_I(BOOST_FUSION_ADAPT_ASSOC_STRUCT_C, name, seq)         \
+        BOOST_PP_SEQ_FOR_EACH_I(BOOST_FUSION_ADAPT_ASSOC_STRUCT_C, name, seq)   \
     }}}                                                                         \
     /***/
 
-#define BOOST_FUSION_ADAPT_ASSOC_STRUCT_C(r, name, i, xy)                             \
+#define BOOST_FUSION_ADAPT_ASSOC_STRUCT_C(r, name, i, xy)                       \
     template <>                                                                 \
     struct struct_member<name, i>                                               \
     {                                                                           \
diff --git a/include/boost/fusion/adapted/struct/detail/end_impl.hpp b/include/boost/fusion/adapted/struct/detail/end_impl.hpp
index 42d7f394..ffb2e77d 100644
--- a/include/boost/fusion/adapted/struct/detail/end_impl.hpp
+++ b/include/boost/fusion/adapted/struct/detail/end_impl.hpp
@@ -9,6 +9,7 @@
 #define BOOST_FUSION_END_IMPL_24122005_1755
 
 #include <boost/fusion/adapted/struct/struct_iterator.hpp>
+#include <boost/fusion/adapted/struct/detail/size_impl.hpp>
 
 namespace boost { namespace fusion
 {
@@ -25,7 +26,12 @@ namespace boost { namespace fusion
             template <typename Sequence>
             struct apply
             {
-                typedef struct_iterator<Sequence, 2> type;
+                typedef
+                    struct_iterator<
+                        Sequence
+                      , size_impl<struct_tag>::template apply<Sequence>::value
+                    >
+                type;
 
                 static type
                 call(Sequence& v)