diff --git a/src/lib/evas/common/evas_map_image_aa.c b/src/lib/evas/common/evas_map_image_aa.c
index 6c829eac17..247ccc2367 100644
--- a/src/lib/evas/common/evas_map_image_aa.c
+++ b/src/lib/evas/common/evas_map_image_aa.c
@@ -234,8 +234,12 @@ _calc_aa_edges_internal(Line *spans, int eidx, int ystart, int yend)
         calc_horiz_coverage(spans, eidx, y, tx[0], tx[1]);
      }
    else
-     calc_vert_coverage(spans, eidx, (y + 1), (edge_diff.y + 2),
-                        (prev_dir & 0x00000001));
+     {
+        ++y;
+        if (y > yend) y = yend;
+        calc_vert_coverage(spans, eidx, y, (edge_diff.y + 2),
+                           (prev_dir & 0x00000001));
+     }
 }
 
 static void