diff --git a/ReflexToQ3/includes/EntityConverter.cpp b/ReflexToQ3/includes/EntityConverter.cpp
index 96e2614..f5fd1da 100644
--- a/ReflexToQ3/includes/EntityConverter.cpp
+++ b/ReflexToQ3/includes/EntityConverter.cpp
@@ -118,8 +118,9 @@ EntityConverter::extractMapInfo(const std::vector<std::vector<std::string>> &ent
     std::cerr << "Map info already extracted, doing nothing" << std::endl;
   }
   else {
-    for ( int i = 0; i < entities.size(); i++ ) { 
-      std::vector<std::string> entity( entities[i] );
+    std::vector<std::vector<std::string>>::const_iterator it;
+    for ( it=entities.begin(); it!=entities.end(); ++it ) {
+      std::vector<std::string> entity( *it );
 
       std::stringstream ss;
       std::copy(entity.begin(), entity.end(),