diff --git a/fake_sort.hpp b/fake_sort.hpp
index e96504f..8f48f06 100755
--- a/fake_sort.hpp
+++ b/fake_sort.hpp
@@ -8,15 +8,20 @@
 # include <boost/concept_check/where.hpp>
 # include <boost/concept_check.hpp>
 
-template<typename RanIter>
-BOOST_CONCEPT_WHERE(
-    ((boost::Mutable_RandomAccessIteratorConcept<RanIter>))
-    ((boost::LessThanComparableConcept<typename boost::detail::iterator_traits<RanIter>::value_type>))
-    
-  , (void))
-fake_sort(RanIter,RanIter)
+namespace fake
 {
+  using namespace boost;
+  
+  template<typename RanIter>
+  BOOST_CONCEPT_WHERE(
+      ((Mutable_RandomAccessIteratorConcept<RanIter>))
+      ((LessThanComparableConcept<typename Mutable_RandomAccessIteratorConcept<RanIter>::value_type>))
+    
+    , (void))
+      sort(RanIter,RanIter)
+  {
  
+  }
 }
 
 #endif // BOOST_LIBS_CONCEPT_CHECK_FAKE_SORT_DWA2006430_HPP
diff --git a/include/boost/concept_check.hpp b/include/boost/concept_check.hpp
index 37f435e..c89983e 100644
--- a/include/boost/concept_check.hpp
+++ b/include/boost/concept_check.hpp
@@ -462,9 +462,8 @@ namespace boost
     : AssignableConcept<TT>
     , EqualityComparableConcept<TT>
   {
-      // require iterator_traits typedef's
+      typedef typename boost::detail::iterator_traits<TT>::value_type value_type;
       typedef typename boost::detail::iterator_traits<TT>::difference_type difference_type;
-      // Hmm, the following is a bit fragile
       typedef typename boost::detail::iterator_traits<TT>::reference reference;
       typedef typename boost::detail::iterator_traits<TT>::pointer pointer;
       typedef typename boost::detail::iterator_traits<TT>::iterator_category iterator_category;
@@ -591,9 +590,10 @@ namespace boost
     : RandomAccessIteratorConcept<TT>
     , Mutable_BidirectionalIteratorConcept<TT>
   {
-    ~Mutable_RandomAccessIteratorConcept() {
-      i[n] = *i;                  // require element access and assignment
-    }
+      ~Mutable_RandomAccessIteratorConcept()
+      {
+          i[n] = *i;                  // require element access and assignment
+      }
    private:
     TT i;
     typename boost::detail::iterator_traits<TT>::difference_type n;
diff --git a/where.cpp b/where.cpp
index a8d1b8e..dfbfd02 100755
--- a/where.cpp
+++ b/where.cpp
@@ -8,6 +8,6 @@
 int main()
 {
   std::vector<int> v;
-  fake_sort(v.begin(), v.end());
+  fake::sort(v.begin(), v.end());
   return 0;
 }
diff --git a/where_fail.cpp b/where_fail.cpp
index 6c10862..e56b40f 100755
--- a/where_fail.cpp
+++ b/where_fail.cpp
@@ -8,6 +8,6 @@
 int main()
 {
   std::list<int> v;
-  fake_sort(v.begin(), v.end());
+  fake::sort(v.begin(), v.end());
   return 0;
 }