diff --git a/include/boost/algorithm/string/detail/finder.hpp b/include/boost/algorithm/string/detail/finder.hpp
index 7f68de5..8be82f1 100644
--- a/include/boost/algorithm/string/detail/finder.hpp
+++ b/include/boost/algorithm/string/detail/finder.hpp
@@ -325,10 +325,14 @@ namespace boost {
                     typedef ForwardIteratorT input_iterator_type;
                     typedef iterator_range<ForwardIteratorT> result_type;
 
-                    input_iterator_type It=Begin+m_N;
-                    if ( It >= End ) It=End;
-
-                    return result_type( Begin, It );
+                    if(std::distance(Begin,End) >= m_N)
+                    {
+                        return result_type(Begin,End);
+                    }
+                    else
+                    {
+                        return result_type(Begin,Begin+m_N);
+                    }
                 }
 
             private: