diff --git a/sql12/core/src/net/sourceforge/squirrel_sql/fw/sql/querytokenizer/ChangeStatementSeparatorSupport.java b/sql12/core/src/net/sourceforge/squirrel_sql/fw/sql/querytokenizer/ChangeStatementSeparatorSupport.java
index 14a07e6f5..31469bc69 100644
--- a/sql12/core/src/net/sourceforge/squirrel_sql/fw/sql/querytokenizer/ChangeStatementSeparatorSupport.java
+++ b/sql12/core/src/net/sourceforge/squirrel_sql/fw/sql/querytokenizer/ChangeStatementSeparatorSupport.java
@@ -44,12 +44,12 @@ public String findSetTerminatorInstruction(final int searchStartPos, SQLCommentA
          return null;
       }
 
-      if(isCommandPrecededBySpacesOrTabsOnly(_script, searchStartPos))
+      // Only when the comment starts on a new line
+      if(false == isCommandPrecededBySpacesOrTabsOnly(_script, searchStartPos))
       {
          return null;
       }
 
-      // Only when the comment starts on a new line
       int newLinePos = _script.indexOf('\n', searchStartPos);
       if(newLinePos > searchStartPos + _terminatorCommandInclLineCommentPrefix.length())
       {
@@ -79,10 +79,10 @@ private static boolean isCommandPrecededBySpacesOrTabsOnly(String script, int se
          else if(c != ' ' && c != '\t')
          {
             // Found non-whitespace character
-            return true;
+            return false;
          }
       }
-      return false;
+      return true;
    }
 
    public boolean isActive()