diff --git a/TextEditor.cpp b/TextEditor.cpp
index 9b13b12..c547972 100644
--- a/TextEditor.cpp
+++ b/TextEditor.cpp
@@ -520,9 +520,9 @@
 			EnterCharacter('\t', shift);
 		else if (!IsReadOnly() && !ctrl && !alt)
 		{
-			for (size_t i = 0; i < sizeof(io.InputCharacters) / sizeof(io.InputCharacters[0]); i++)
+			for (int i = 0; i < io.InputQueueCharacters.Size; i++)
 			{
-				auto c = (unsigned char)io.InputCharacters[i];
+				auto c = (unsigned char)io.InputQueueCharacters[i];
 				if (c != 0)
 				{
 					if (isprint(c) || isspace(c))
@@ -531,6 +531,7 @@
 					}
 				}
 			}
+			io.InputQueueCharacters.resize(0);
 		}
 	}
 }
diff --git a/TextEditor.h b/TextEditor.h
index fe1bebe..66df7eb 100644
--- a/TextEditor.h
+++ b/TextEditor.h
@@ -162,7 +162,7 @@
 		bool mCaseSensitive;
 		
 		LanguageDefinition()
-			: mTokenize(nullptr), mPreprocChar('#'), mAutoIndentation(true), mCaseSensitive(true)
+			: mPreprocChar('#'), mAutoIndentation(true), mTokenize(nullptr), mCaseSensitive(true)
 		{
 		}