1 files changed, 8 insertions, 0 deletions

diff --git a/sinksh/syntaxtree.cpp b/sinksh/syntaxtree.cpp
index 3380b04..8a8684c 100644
--- a/sinksh/syntaxtree.cpp
+++ b/sinksh/syntaxtree.cpp
@@ -101,14 +101,22 @@ SyntaxTree::Command SyntaxTree::match(const QStringList &commandLine) const
     QStringList tailCommands;
     while (commandLineIt.hasNext() && syntaxIt.hasNext()) {
         const QString word = commandLineIt.next();
+        bool match = false;
         while (syntaxIt.hasNext()) {
             const Syntax &syntax = syntaxIt.next();
             if (word == syntax.keyword) {
                 lastFullSyntax = &syntax;
                 syntaxIt = syntax.children;
+                match = true;
                 break;
             }
         }
+        if (!match) {
+            //Otherwise we would miss the just evaluated command from the tailCommands
+            if (commandLineIt.hasPrevious()) {
+                commandLineIt.previous();
+            }
+        }
     }
 
     if (lastFullSyntax) {