2 files changed, 10 insertions, 8 deletions

diff --git a/src/FbTk/MacroCommand.cc b/src/FbTk/MacroCommand.cc
index 511683b..555e5f5 100644
--- a/src/FbTk/MacroCommand.cc
+++ b/src/FbTk/MacroCommand.cc
@@ -33,16 +33,18 @@ namespace {
 template <typename M>
 M *addCommands(M *macro, const std::string &args, bool trusted) {
 
-    std::string blah;
+    std::string remainder;
     std::list<std::string> cmds;
-    StringUtil::stringTokensBetween(cmds, args, blah, '{', '}');
+    StringUtil::stringTokensBetween(cmds, args, remainder, '{', '}');
     RefCount<Command<void> > cmd(0);
 
-    std::list<std::string>::iterator it = cmds.begin(), it_end = cmds.end();
-    for (; it != it_end; ++it) {
-        cmd = CommandParser<void>::instance().parse(*it, trusted);
-        if (*cmd)
-            macro->add(cmd);
+    if (remainder.length() == 0) {
+        std::list<std::string>::iterator it = cmds.begin(), it_end = cmds.end();
+        for (; it != it_end; ++it) {
+            cmd = CommandParser<void>::instance().parse(*it, trusted);
+            if (*cmd)
+                macro->add(cmd);
+        }
     }
 
     if (macro->size() > 0)
diff --git a/src/FbTk/StringUtil.hh b/src/FbTk/StringUtil.hh
index 75fa69e..35f23a2 100644
--- a/src/FbTk/StringUtil.hh
+++ b/src/FbTk/StringUtil.hh
@@ -84,7 +84,7 @@ static void stringTokensBetween(Container &container, const std::string &in,
     while (true) {
         err = getStringBetween(token, in.c_str() + pos, first, last, ok_chars,
                                allow_nesting);
-        if (err == 0)
+        if (err <= 0)
             break;
         container.push_back(token);
         pos += err;