--- a/client.c	Wed Aug 16 19:25:29 2006 +0200
+++ b/client.c	Thu Aug 17 09:35:44 2006 +0200
@@ -285,7 +285,6 @@
 {
 	int bottom = c->y + c->h;
 	int right = c->x + c->w;
-	/*XConfigureEvent e;*/
 	XWindowChanges wc;
 
 	if(sizehints) {
@@ -302,9 +301,9 @@
 		if(c->maxh && c->h > c->maxh)
 			c->h = c->maxh;
 	}
-	if(c->x > right) /* might happen on restart */
-		c->x = right - c->w;
-	if(c->y > bottom)
+	if(c->x > sw) /* might happen on restart */
+		c->x = sw - c->w;
+	if(c->y > sh)
 		c->y = bottom - c->h;
 	if(sticky == TopRight || sticky == BotRight)
 		c->x = right - c->w;