diff --git a/include/boost/algorithm/string/detail/find_format_store.hpp b/include/boost/algorithm/string/detail/find_format_store.hpp
index 054bdbb..a1afc55 100644
--- a/include/boost/algorithm/string/detail/find_format_store.hpp
+++ b/include/boost/algorithm/string/detail/find_format_store.hpp
@@ -47,12 +47,7 @@ namespace boost {
                 find_format_store& operator=( FindResultT FindResult )
                 {
                     iterator_range<ForwardIteratorT>::operator=(FindResult);
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
-                    format_result_type temp(m_Formatter(FindResult));
-                    m_FormatResult=format_result_type(temp);
-#else
                     m_FormatResult=m_Formatter(FindResult);
-#endif
                     
                     return *this;
                 }
diff --git a/include/boost/algorithm/string/detail/formatter.hpp b/include/boost/algorithm/string/detail/formatter.hpp
index ab58b6c..367bf67 100644
--- a/include/boost/algorithm/string/detail/formatter.hpp
+++ b/include/boost/algorithm/string/detail/formatter.hpp
@@ -41,6 +41,14 @@ namespace boost {
                     m_Format(begin(Format), end(Format)) {}
 
                 // Operation
+#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+                template<typename Range2T>
+                result_type& operator()(const Range2T&)
+                {
+                    return m_Format;
+                }
+#endif
+
                 template<typename Range2T>
                 const result_type& operator()(const Range2T&) const
                 {