diff --git a/WINGs/wwindow.c b/WINGs/wwindow.c
index ab6a4acd..5aefd9eb 100644
--- a/WINGs/wwindow.c
+++ b/WINGs/wwindow.c
@@ -311,12 +311,12 @@ setSizeHints(WMWindow *win)
     hints->flags = 0;
 
     if (win->flags.upos_set) {
-	hints->flags |= USPosition;  /* shouldn't be PPosition ? --Dan */
+	hints->flags |= PPosition;
 	hints->x = win->upos.x;
 	hints->y = win->upos.y;
     }
     if (win->usize.width>0 && win->usize.height>0) {
-	hints->flags |= USSize;      /* shouldn't be PSize ? --Dan */
+	hints->flags |= PSize;
 	hints->width = win->usize.width;
 	hints->height = win->usize.height;
     }
diff --git a/src/client.c b/src/client.c
index 331c20a1..5246180b 100644
--- a/src/client.c
+++ b/src/client.c
@@ -718,7 +718,7 @@ wClientGetNormalHints(WWindow *wwin, XWindowAttributes *wattribs, Bool geometry,
 #ifdef IGNORE_PPOSITION
     wwin->normal_hints->flags &= ~PPosition;
 #endif
-    if (!pre_icccm && !wwin->screen_ptr->flags.startup && geometry) {
+    if (/* check this !pre_icccm && */!wwin->screen_ptr->flags.startup && geometry) {
 	if (wwin->normal_hints->flags & (USPosition|PPosition)) {
 	    *x = wwin->normal_hints->x;
 	    *y = wwin->normal_hints->y;