diff --git a/include/boost/fusion/container/map/map_iterator.hpp b/include/boost/fusion/container/map/map_iterator.hpp
index 03242026..4927e155 100644
--- a/include/boost/fusion/container/map/map_iterator.hpp
+++ b/include/boost/fusion/container/map/map_iterator.hpp
@@ -12,7 +12,10 @@
 #include <boost/fusion/iterator/iterator_facade.hpp>
 #include <boost/mpl/minus.hpp>
 #include <boost/mpl/equal_to.hpp>
+#include <boost/mpl/if.hpp>
 #include <boost/utility/declval.hpp>
+#include <boost/type_traits/is_const.hpp>
+#include <boost/type_traits/add_const.hpp>
 
 namespace boost { namespace fusion
 {
@@ -83,11 +86,18 @@ namespace boost { namespace fusion
         {
             typedef typename Iterator::sequence sequence;
             typedef typename Iterator::index index;
+
+            typedef decltype(boost::declval<sequence>().get(index()).second) second_type_;
+
             typedef typename
-                add_reference<
-                    decltype(boost::declval<sequence>().get(index()).second)
+                mpl::if_<
+                    is_const<sequence>
+                  , typename add_const<second_type_>::type
+                  , second_type_
                 >::type
-            type;
+            second_type;
+
+            typedef typename add_reference<second_type>::type type;
 
             BOOST_FUSION_GPU_ENABLED
             static type
diff --git a/test/sequence/map.cpp b/test/sequence/map.cpp
index 9e4ecafb..8795dda0 100644
--- a/test/sequence/map.cpp
+++ b/test/sequence/map.cpp
@@ -148,6 +148,15 @@ main()
         typedef boost::fusion::result_of::deref_data<i_type>::type r_type;
         BOOST_STATIC_ASSERT((boost::is_same<r_type, int&>::value));
     }
+    
+    {
+        // compile test only
+        // make sure result_of::deref_data is const correct
+        typedef map<pair<float, int> > const map_type;
+        typedef boost::fusion::result_of::begin<map_type>::type i_type;
+        typedef boost::fusion::result_of::deref_data<i_type>::type r_type;
+        BOOST_STATIC_ASSERT((boost::is_same<r_type, int const&>::value));
+    }
 
     return boost::report_errors();
 }