diff --git a/src/bin/e_container.c b/src/bin/e_container.c
index c899254bf..73bc6f0d6 100644
--- a/src/bin/e_container.c
+++ b/src/bin/e_container.c
@@ -337,8 +337,7 @@ e_container_zone_at_point_get(E_Container *con, int x, int y)
 	E_Zone *zone;
 	
 	zone = l->data;
-	if ((E_SPANS_COMMON(zone->x, zone->w, x, 1)) &&
-	    (E_SPANS_COMMON(zone->y, zone->h, y, 1)))
+	if (E_INSIDE(x, y, zone->x, zone->y, zone->w, zone->h))
 	  return zone;
      }
    return NULL;
diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index 272075324..c28d41eec 100644
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -245,8 +245,7 @@ e_zone_current_get(E_Container *con)
 	     E_Zone *zone;
 	     
 	     zone = l->data;
-	     if (E_INTERSECTS(x, y, 1, 1,
-			      zone->x, zone->y, zone->w, zone->h))
+	     if (E_INSIDE(x, y, zone->x, zone->y, zone->w, zone->h))
 	       return zone;
 	  }
      }