diff --git a/src/tokenize.cpp b/src/tokenize.cpp
index 6e2b7b9b5..2ceca1264 100644
--- a/src/tokenize.cpp
+++ b/src/tokenize.cpp
@@ -1884,15 +1884,14 @@ bool Tokenizer::simplifyQuestionMark()
                 continue;
 
             end = end->next();
-            tok = tok->previous();
+            tok = tok->previous()->previous();
             while (tok->next() != end)
             {
                 tok->deleteNext();
             }
 
-            Token *temp = tok;
             tok = tok->next();
-            temp->deleteThis();
+            ret = true;
         }
         else
         {