diff --git a/legacy/evas/ChangeLog b/legacy/evas/ChangeLog
index d2f9994a25..63dcdfabea 100644
--- a/legacy/evas/ChangeLog
+++ b/legacy/evas/ChangeLog
@@ -760,3 +760,10 @@
 2012-05-24  Carsten Haitzler (The Rasterman)
 
         * 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.
+
+
diff --git a/legacy/evas/src/lib/canvas/evas_render.c b/legacy/evas/src/lib/canvas/evas_render.c
index ae595805ca..98c4ae7d3b 100644
--- a/legacy/evas/src/lib/canvas/evas_render.c
+++ b/legacy/evas/src/lib/canvas/evas_render.c
@@ -1199,6 +1199,7 @@ evas_render_mapped(Evas *e, Evas_Object *obj, void *context, void *surface,
              obj->func->render(obj, e->engine.data.output, context, surface,
                                off_x, off_y);
           }
+        if (obj->changed_map) clean_them = EINA_TRUE;
      }
    RDI(level);
    RD("      }\n");