diff --git a/legacy/evas/src/lib/canvas/evas_map.c b/legacy/evas/src/lib/canvas/evas_map.c
index 2b0591b6eb..9c2d71a056 100644
--- a/legacy/evas/src/lib/canvas/evas_map.c
+++ b/legacy/evas/src/lib/canvas/evas_map.c
@@ -171,16 +171,15 @@ _evas_map_free(Evas_Object *obj, Evas_Map *m)
         if (m->surface)
           obj->layer->evas->engine.func->image_map_surface_free
           (obj->layer->evas->engine.data.output, m->surface);
+        if (obj->spans)
+          {
+             // FIXME: destroy engine side spans
+             free(obj->spans);
+             obj->spans = NULL;
+          }      
      }
    m->magic = 0;
    free(m);
-
-   if (obj->spans)
-     {
-        // FIXME: destroy engine side spans
-        free(obj->spans);
-        obj->spans = NULL;
-     }      
 }
 
 /****************************************************************************/