diff --git a/lib/OpenLayers/Layer.js b/lib/OpenLayers/Layer.js
index a95008c76e..8b0ddf9e54 100644
--- a/lib/OpenLayers/Layer.js
+++ b/lib/OpenLayers/Layer.js
@@ -43,6 +43,13 @@ OpenLayers.Layer.prototype = {
         return;
     },
     
+    /**
+     * @param {OpenLayers.Map} map
+     */
+    setMap: function(map) {
+        this.map = map;
+    },
+    
     /**
     * @return {bool}
     */
diff --git a/lib/OpenLayers/Map.js b/lib/OpenLayers/Map.js
index 0009f45edb..f187c755e6 100644
--- a/lib/OpenLayers/Map.js
+++ b/lib/OpenLayers/Map.js
@@ -129,7 +129,7 @@ OpenLayers.Map.prototype = {
     * @param {OpenLayers.Layer} layer
     */    
     addLayer: function (layer, zIndex) {
-        layer.map = this;
+        layer.setMap(this);
         layer.div.style.overflow = "";
         if (zIndex) {
             layer.div.style.zIndex = zIndex;