diff --git a/sql12/core/src/net/sourceforge/squirrel_sql/fw/sql/querytokenizer/QueryTokenizer.java b/sql12/core/src/net/sourceforge/squirrel_sql/fw/sql/querytokenizer/QueryTokenizer.java
index 8d4052a1b..caa84ac1a 100755
--- a/sql12/core/src/net/sourceforge/squirrel_sql/fw/sql/querytokenizer/QueryTokenizer.java
+++ b/sql12/core/src/net/sourceforge/squirrel_sql/fw/sql/querytokenizer/QueryTokenizer.java
@@ -170,7 +170,7 @@ public void setScriptToTokenize(String script)
                    if (i == 0 || script.charAt(i-1) == '\n') {
                        // Only when the comment starts on a new line
                        int newLinePos = script.indexOf('\n', i);
-                       if (newLinePos > 0 && newLinePos > i+18) {
+                       if (newLinePos > i+18) {
                            String terminator = script.substring(i + 16 + _lineCommentBegin.length(), newLinePos).trim();
                            if (!terminator.isEmpty()) {
                                s_log.info("changing statement separator to '" + terminator + "'");