diff --git a/src/CommandFormats.hh b/src/CommandFormats.hh
index 6b889253..5ed50c71 100644
--- a/src/CommandFormats.hh
+++ b/src/CommandFormats.hh
@@ -5190,7 +5190,7 @@ struct G_MapList_GC_Ep3_6xB6x40 {
   le_uint16_t compressed_data_size;
   le_uint16_t unused;
   // PRS-compressed map list data follows here. newserv generates this from the
-  // map index at startup; see the MapList struct in Episode3/DataIndexes.hh
+  // map index when requested; see the MapList struct in Episode3/DataIndexes.hh
   // and Episode3::MapIndex::get_compressed_map_list for details on the format.
 } __packed__;
 
diff --git a/src/Main.cc b/src/Main.cc
index cb57f44a..4f50d154 100644
--- a/src/Main.cc
+++ b/src/Main.cc
@@ -1787,7 +1787,7 @@ int main(int argc, char** argv) {
 
     case Behavior::SHOW_EP3_MAPS: {
       config_log.info("Collecting Episode 3 data");
-      Episode3::MapIndex map_index("system/ep3");
+      Episode3::MapIndex map_index("system/ep3/maps");
       Episode3::CardIndex card_index("system/ep3/card-definitions.mnr", "system/ep3/card-definitions.mnrd", "system/ep3/card-text.mnr", "system/ep3/card-text.mnrd");
 
       auto map_ids = map_index.all_numbers();