diff --git a/src/common.js b/src/common.js
index 5f65b8daa8..567a2229ac 100644
--- a/src/common.js
+++ b/src/common.js
@@ -1494,14 +1494,13 @@
             var _group = function(parts) {
                 var result = [];
                 var push_result = function(part) {
-                    result.push([part]);
+                    var clause = [part];
+                    clause.clause = true;
+                    result.push(clause);
                 };
                 var i = parts.indexOf(':');
                 if (!~i) {
                     parts.forEach(push_result);
-                    result.forEach(function (e) {
-                        e.clause = true;
-                    });
                     return result;
                 }
                 var sub_group = function(name, lvalue) {
diff --git a/tests/sao.js b/tests/sao.js
index 1944ccc26c..314dcba88f 100644
--- a/tests/sao.js
+++ b/tests/sao.js
@@ -1133,6 +1133,7 @@
             c(['Doe'])
             ]],
         ['Name: "John Doe"', [c(['Name', null, 'John Doe'])]],
+        ['Doe Name: John', [c(['Doe']), c(['Name', null, 'John'])]],
         ['Name: =Doe', [['Name', '=', 'Doe']]],
         ['Name: =Doe Name: >John', [
             c(['Name', '=', 'Doe']),