diff --git a/src/util/io/package.cpp b/src/util/io/package.cpp
index 9cb23451..977214a7 100644
--- a/src/util/io/package.cpp
+++ b/src/util/io/package.cpp
@@ -202,10 +202,10 @@ unique_ptr<wxInputStream> Package::openIn(const String& file) {
   unique_ptr<wxInputStream> stream;
   if (it != files.end() && it->second.wasWritten()) {
     // written to this file, open the temp file
-    stream = make_unique<BufferedFileInputStream>(it->second.tempName);
+    stream = make_unique<wxFileInputStream>(it->second.tempName);
   } else if (wxFileExists(filename+_("/")+file)) {
     // a file in directory package
-    stream = make_unique<BufferedFileInputStream>(filename+_("/")+file);
+    stream = make_unique<wxFileInputStream>(filename+_("/")+file);
   } else if (wxFileExists(filename) && it != files.end() && it->second.zipEntry) {
     // a file in a zip archive
     stream = make_unique<ZipFileInputStream>(filename, it->second.zipEntry);
diff --git a/src/util/io/reader.hpp b/src/util/io/reader.hpp
index 9f54edc6..c2eda096 100644
--- a/src/util/io/reader.hpp
+++ b/src/util/io/reader.hpp
@@ -145,7 +145,7 @@ private:
   /// Line number of the previous_line
   int previous_line_number;
   /// Input stream we are reading from
-  wxInputStream& input;
+  wxBufferedInputStream input;
   /// Accumulated warning messages
   String warnings;