diff --git a/wcs/admin/workflows.ptl b/wcs/admin/workflows.ptl
index 41b49dd57..ec1207d62 100644
--- a/wcs/admin/workflows.ptl
+++ b/wcs/admin/workflows.ptl
@@ -133,7 +133,10 @@ def graphviz(workflow, url_prefix='', select=None, svg=True,
                     label += ' %s %s' % (_('by'), roles)
             else:
                 label = item.render_as_line()
-            label = textwrap.fill(label.replace('"', '\\"'), 20)
+            label = label.replace('"', '\\"')
+            label = label.decode('utf8')
+            label = textwrap.fill(label, 20, break_long_words=False)
+            label = label.encode('utf8')
             label = label.replace('\n', '\\n')
             print >>out, '[label="%s"' % label,
             if select == '%s-%s' % (i, item.id):