diff --git a/frontend-js/src/main/js/map/AbstractCustomMap.js b/frontend-js/src/main/js/map/AbstractCustomMap.js
index a2c94acfbb0eb552a0ebae4047073b77f4c93ed5..a2016e0ffef55e6cf2ffe76f0cc489a9586d2ddf 100644
--- a/frontend-js/src/main/js/map/AbstractCustomMap.js
+++ b/frontend-js/src/main/js/map/AbstractCustomMap.js
@@ -411,7 +411,7 @@ AbstractCustomMap.prototype.turnOnDrawing = function() {
       zIndex : 1
     }
   });
-  this._drawingManager.setMap(this.map);
+  this._drawingManager.setMap(this.getGoogleMap());
   this._drawingManager.setDrawingMode(google.maps.drawing.OverlayType.POLYGON);
 
   google.maps.event.addListener(this._drawingManager, 'overlaycomplete', function(e) {
@@ -940,7 +940,7 @@ AbstractCustomMap.prototype.getSelectedLayoutOverlays = function() {
  * @returns google.maps.map object used to representing data
  */
 AbstractCustomMap.prototype.getGoogleMap = function() {
-  return this.map;
+  return this._map;
 };
 
 /**
@@ -948,7 +948,7 @@ AbstractCustomMap.prototype.getGoogleMap = function() {
  * 
  */
 AbstractCustomMap.prototype.setGoogleMap = function(gmap) {
-  this.map = gmap;
+  this._map = gmap;
 };
 
 AbstractCustomMap.prototype.isMarkerOptimization = function() {
diff --git a/frontend-js/src/main/js/map/Submap.js b/frontend-js/src/main/js/map/Submap.js
index 1eba3748a4932e010fe6ea498c6e21d1fa8aa5d2..13d0bb0e27ad447e26c4910d41834758d536926e 100644
--- a/frontend-js/src/main/js/map/Submap.js
+++ b/frontend-js/src/main/js/map/Submap.js
@@ -75,7 +75,7 @@ Submap.prototype.init = function(htmlTag, jsVar) {
 
     var mapOptions = this.creatMapOptions(this.configuration.MAPS.length);
 
-    this.map = new google.maps.Map(controlDiv, mapOptions);
+    this.setGoogleMap(new google.maps.Map(controlDiv, mapOptions));
     if (this.isCustomTouchInterface()) {
       this._touchInterface = new TouchMap(this);
     }
diff --git a/frontend-js/src/main/js/map/TouchMap.js b/frontend-js/src/main/js/map/TouchMap.js
index f12035f14d00f6b75365c9c6a8c881e86edef0c2..a48dea7b77f14d6009f8ffcf493598476dc45ff1 100644
--- a/frontend-js/src/main/js/map/TouchMap.js
+++ b/frontend-js/src/main/js/map/TouchMap.js
@@ -374,11 +374,11 @@ TouchMap.prototype.ongoingTouchIndexById = function(idToFind) {
 
 
 TouchMap.prototype.setMap = function(map) {
-  this.map = map;
+  this._map = map;
 };
 
 TouchMap.prototype.getMap = function() {
-  return this.map;
+  return this._map;
 };
 
 module.exports = TouchMap;
diff --git a/frontend-js/src/main/js/map/overlay/OverlayCollection.js b/frontend-js/src/main/js/map/overlay/OverlayCollection.js
index b390e3524e78f023643f4cf400a6e7f5ceedad37..1c2c1b0bc9bddd369a06b19611a4218e64a67af2 100644
--- a/frontend-js/src/main/js/map/overlay/OverlayCollection.js
+++ b/frontend-js/src/main/js/map/overlay/OverlayCollection.js
@@ -209,11 +209,11 @@ OverlayCollection.prototype._getDetailArrayByIdentifiedElement = function(elemen
 };
 
 OverlayCollection.prototype.setMap = function(map) {
-  this.map = map;
+  this._map = map;
 };
 
 OverlayCollection.prototype.getMap = function() {
-  return this.map;
+  return this._map;
 };
 
 module.exports = OverlayCollection;