diff --git a/LibCarla/source/carla/client/Map.cpp b/LibCarla/source/carla/client/Map.cpp
index 0f39a92f4..8efdd93d1 100644
--- a/LibCarla/source/carla/client/Map.cpp
+++ b/LibCarla/source/carla/client/Map.cpp
@@ -28,12 +28,15 @@ namespace client {
 
   Map::Map(rpc::MapInfo description, std::string xodr_content)
     : _description(std::move(description)),
-      _map(MakeMap(xodr_content)){}
-
+      _map(MakeMap(xodr_content)){
+    open_drive_file = xodr_content;
+  }
   Map::Map(std::string name, std::string xodr_content)
     : Map(rpc::MapInfo{
     std::move(name),
-    std::vector<geom::Transform>{}}, xodr_content) {}
+    std::vector<geom::Transform>{}}, xodr_content) {
+    open_drive_file = xodr_content;
+  }
 
   Map::~Map() = default;
 
diff --git a/PythonAPI/test/smoke/test_map.py b/PythonAPI/test/smoke/test_map.py
index 485c752d7..e92701c86 100644
--- a/PythonAPI/test/smoke/test_map.py
+++ b/PythonAPI/test/smoke/test_map.py
@@ -27,7 +27,7 @@ class TestMap(SmokeTest):
                 # workaround: give time to UE4 to clean memory after loading (old assets)
                 time.sleep(5)
                 m = world.get_map()
-                self.assertEqual(map_name.split('/')[-1], m.name)
+                self.assertEqual(map_name.split('/')[-1], m.name.split('/')[-1])
                 self._check_map(m)
 
     def _check_map(self, m):