diff --git a/src/ddc/lexer/tokenizer.d b/src/ddc/lexer/tokenizer.d
index 60d738f..605fe68 100644
--- a/src/ddc/lexer/tokenizer.d
+++ b/src/ddc/lexer/tokenizer.d
@@ -1431,6 +1431,7 @@ class Tokenizer
         _pos = 0;
         _prevLineLength = 0;
         _lineText = null;
+        nextLine();
     }
 	
 	this(string code, string filename = "") {
@@ -1459,11 +1460,7 @@ class Tokenizer
 	}
 	
 	protected dchar nextChar() {
-		if (_lineText is null) {
-			if (!nextLine()) {
-				return EOF_CHAR;
-			}
-		} else if (_pos >= _len) {
+	    if (_pos >= _len) {
 			if (!nextLine()) {
 				return EOF_CHAR;
 			}
diff --git a/workspaces/sample1/sampleproject1/source/main.d b/workspaces/sample1/sampleproject1/source/main.d
index 8f037da..e791fbe 100644
Binary files a/workspaces/sample1/sampleproject1/source/main.d and b/workspaces/sample1/sampleproject1/source/main.d differ