diff --git a/base/base_tests/string_utils_test.cpp b/base/base_tests/string_utils_test.cpp
index 773207c087..605a28557f 100644
--- a/base/base_tests/string_utils_test.cpp
+++ b/base/base_tests/string_utils_test.cpp
@@ -295,6 +295,12 @@ UNIT_TEST(SimpleTokenizer)
              " -\xD9\x87", tokens);
   }
 
+  {
+    char const * s[] = {"27.535536", "53.884926" , "189"};
+    tokens.assign(&s[0], &s[0] + ARRAY_SIZE(s));
+    TestIter("27.535536,53.884926,189", ",", tokens);
+  }
+
   {
     char const * s[] = {"1", "2"};
     tokens.assign(&s[0], &s[0] + ARRAY_SIZE(s));
diff --git a/base/string_utils.hpp b/base/string_utils.hpp
index f62dce1c30..fab8f30713 100644
--- a/base/string_utils.hpp
+++ b/base/string_utils.hpp
@@ -79,12 +79,14 @@ class TokenizeIterator
   }
 
 public:
+  /// @warning string S must be not temporary!
   TokenizeIterator(string const & s, DelimFuncT const & delimFunc)
   : m_beg(s.begin()), m_end(s.begin()), m_finish(s.end()), m_delimFunc(delimFunc)
   {
     move();
   }
 
+  /// @warning unistring S must be not temporary!
   TokenizeIterator(UniString const & s, DelimFuncT const & delimFunc)
   : m_beg(s.begin()), m_end(s.begin()), m_finish(s.end()), m_delimFunc(delimFunc)
   {
diff --git a/map/stub_data.hpp b/map/stub_data.hpp
deleted file mode 100644
index e69de29bb2..0000000000