diff --git a/specs/python-timmy.spec b/specs/python-timmy.spec
index 992657a..91cba5f 100644
--- a/specs/python-timmy.spec
+++ b/specs/python-timmy.spec
@@ -107,6 +107,9 @@ popd
 
 
 %changelog
+* Tue Oct 24 2017 Dmitry Sutyagin <dsutyagin@mirantis.com> - 1.26.13
+- Change: improve roles string split
+
 * Fri Oct 20 2017 Dmitry Sutyagin <dsutyagin@mirantis.com> - 1.26.12
 - Fix: scripts_all_pairs does not trigger archive
 
diff --git a/timmy/env.py b/timmy/env.py
index dcbd7c0..d1140f7 100644
--- a/timmy/env.py
+++ b/timmy/env.py
@@ -16,7 +16,7 @@
 #    under the License.
 
 project_name = 'timmy'
-version = '1.26.12'
+version = '1.26.13'
 
 if __name__ == '__main__':
     import sys
diff --git a/timmy/nodes.py b/timmy/nodes.py
index 389c0b1..72bde5f 100644
--- a/timmy/nodes.py
+++ b/timmy/nodes.py
@@ -59,7 +59,7 @@ class Node(object):
         if type(roles) is list:
             self.roles = roles
         else:
-            self.roles = roles.split(', ') if roles else []
+            self.roles = re.split(', *', roles) if roles else []
         self.os_platform = os_platform
         self.online = online
         self.status = status