diff --git a/aegilib/src/controller.cpp b/aegilib/src/controller.cpp
index 34114fe17..1498ab072 100644
--- a/aegilib/src/controller.cpp
+++ b/aegilib/src/controller.cpp
@@ -60,8 +60,8 @@ void Controller::LoadFile(const String filename,const String encoding)
 {
 	const FormatPtr handler = FormatManager::GetFormatFromFilename(filename,true);
 	wxFFileInputStream stream(filename);
-	wxBufferedInputStream buffer(stream);
-	model.Load(buffer,handler,encoding);
+	//wxBufferedInputStream buffer(stream);
+	model.Load(stream,handler,encoding);
 }
 
 
diff --git a/aegilib/src/text_file_reader.cpp b/aegilib/src/text_file_reader.cpp
index cbeb8d772..ae693cf1e 100644
--- a/aegilib/src/text_file_reader.cpp
+++ b/aegilib/src/text_file_reader.cpp
@@ -136,7 +136,7 @@ void ParseLine(FastBuffer<T> &_buffer,wxInputStream &file,wxString &stringBuffer
 	// If no line breaks were found, load more data into file
 	while (newLinePos == -1) {
 		// Read 2048 bytes
-		const size_t readBytes = 2048;
+		const size_t readBytes = 1024;
 		const size_t read = readBytes/sizeof(T);
 		size_t oldSize = _buffer.GetSize();
 		T *ptr = _buffer.GetWritePtr(read);