diff --git a/TODO b/TODO
index 682bd06a9..e39a09e93 100644
--- a/TODO
+++ b/TODO
@@ -8,6 +8,7 @@ Some of the things (in very short form) that need to be done to E17...
   BUGS / FIXES
 -------------------------------------------------------------------------------
 
+* BUG: smart placement seems to screw up if a shelf is at the top of the screen
 * BUG: e17 screen res diaolg doesnt work under xephyr - why?
 * BUG: the ibar specific menu only shows when you right click on icons (and not
   on the bar itself). so, if there are no icons you can't get to the config.
@@ -74,6 +75,8 @@ Some of the things (in very short form) that need to be done to E17...
   CLEANUPS
 -------------------------------------------------------------------------------
 
+* desktop transitions with xinerama - are... weird. might stretch the anim to
+use the whole container bounds.
 * bg gradient dialog needs a preview widget. also edje needs to be updated so we can do proper fills for non 0 angles.
 * clientinfo dialog could be nicer - then again it is an obsucre thing.
 * desklock's pam profile should be configurable as system-auth doesn't
diff --git a/src/bin/e_maximize.c b/src/bin/e_maximize.c
index 636a9e992..e1f9b9414 100644
--- a/src/bin/e_maximize.c
+++ b/src/bin/e_maximize.c
@@ -136,7 +136,8 @@ e_maximize_border_gadman_fill(E_Border *bd, int *x1, int *y1, int *x2, int *y2)
 
 	es = l->data;
 	if (es->zone != bd->zone) continue;
-	OBSTACLE(es->x, es->y, es->x + es->w, es->y + es->h);
+	OBSTACLE(es->x + es->zone->x, es->y + es->zone->y, 
+		 es->x + es->zone->x + es->w, es->y + es->zone->y + es->h);
      }
    if (rects)
      {