diff --git a/ReflexToQ3/main.cpp b/ReflexToQ3/main.cpp
index fe0bbcc..f275d9b 100644
--- a/ReflexToQ3/main.cpp
+++ b/ReflexToQ3/main.cpp
@@ -96,14 +96,15 @@ void print_entities(vector<vector<string> > &q) {
 }
 
 
-void convert_entities(const cxxopts::Options &o, vector<vector<string> > &q) {
+void convert_entities(const cxxopts::Options &o, const vector<vector<string> > &q) {
     string entfile = o["e"].as<string>();
     if (entfile.empty()) {
         cout << "No entity data file given"
                 "- skipping entity conversion" << endl;
         return;
     }
-    EntityConverter e(entfile, o[ARG_INPUT_SHORTALIAS].as<string>());
+    EntityConverter e(entfile);
+    e.extractMapInfo(q);
     ofstream fout(o[ARG_OUTPUT_SHORTALIAS].as<string>(), ios::app);
     brushdef fn = &brushdef_net;
     vector<string> entity;