diff --git a/legacy/evas/ChangeLog b/legacy/evas/ChangeLog
index 530dc657b8..6c002af0f8 100644
--- a/legacy/evas/ChangeLog
+++ b/legacy/evas/ChangeLog
@@ -761,13 +761,14 @@
 
         * Fix evas_object_image_memfile_set() on non-linux systems.
 
-2012-05-29  ChunEon Park (Hermet)
-
-	* Fixed to clean up when map actually changed. Now rendering updates will be
-     correct after evas_map acutally disabled for the smart object.
-
 2012-05-29  Tom Hacohen (TAsn)
 
 	* Text: Fixed an issue with text object sizing.
 	* Font: Fixed run-time italic.
 
+2012-05-30  ChunEon Park (Hermet)
+
+	* Fixed to clean up when map actually changed. Now rendering updates will be
+     correct after evas_map acutally disabled/enabled for the smart object.
+
+
diff --git a/legacy/evas/src/lib/canvas/evas_render.c b/legacy/evas/src/lib/canvas/evas_render.c
index d40e1c39ba..cc370131e3 100644
--- a/legacy/evas/src/lib/canvas/evas_render.c
+++ b/legacy/evas/src/lib/canvas/evas_render.c
@@ -518,14 +518,16 @@ _evas_render_check_pending_objects(Eina_Array *pending_objects, Evas *e)
 
    for (i = 0; i < pending_objects->count; ++i)
      {
-        Evas_Object *obj;
+        Evas_Object *obj, *parent;
         int is_active;
         Eina_Bool ok = EINA_FALSE;
-
         obj = eina_array_data_get(pending_objects, i);
-
         if (!obj->layer) goto clean_stuff;
 
+        parent = evas_object_smart_parent_get(obj);
+        if (parent && _evas_render_has_map(parent))
+          goto clean_stuff;
+
         evas_object_clip_recalc(obj);
         is_active = evas_object_is_active(obj);