diff --git a/src/utils/string_utils.cpp b/src/utils/string_utils.cpp
index c909b19fe..2e58306d8 100644
--- a/src/utils/string_utils.cpp
+++ b/src/utils/string_utils.cpp
@@ -168,7 +168,7 @@ namespace StringUtils
         try
         {
             std::string::size_type start=0;
-            while(start!=std::string::npos && start<(unsigned int)s.size())
+            while(start < (unsigned int) s.size())
             {
                 std::string::size_type i=s.find(c, start);
                 if (i!=std::string::npos)
@@ -186,11 +186,11 @@ namespace StringUtils
                 }
                 else   // end of string reached
                 {
-                    if (keepSplitChar)
+                    if (keepSplitChar && start != 0)
                         result.push_back(std::string(s,start-1));
                     else
                         result.push_back(std::string(s,start));
-                    start = i;
+                    return result;
                 }
             }
             return result;
@@ -251,7 +251,6 @@ namespace StringUtils
                         result.push_back( s.subString(start, s.size()-start) );
 
                     return result;
-                    //start = i+1;
                 }
             }
             return result;