diff --git a/ChangeLog b/ChangeLog
index 1e02fe8a..a6545f8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
 2005-08-24
 	* More configure and makefile updates
 	* Added scale arg for net graphs
+	* Fixed bug in own_window stuff
 
 2005-08-23
 	* Added maximum_width
diff --git a/src/conky.c b/src/conky.c
index 535b7c5f..4fbef4cc 100644
--- a/src/conky.c
+++ b/src/conky.c
@@ -3540,7 +3540,7 @@ static void main_loop()
 					/* if position isn't what expected, set fixed pos, total_updates
 					 * avoids setting fixed_pos when window is set to weird locations
 					 * when started */
-					if (total_updates >= 2
+					/*if (total_updates >= 2 this is broken
 					    && !fixed_pos
 					    && (window.x != ev.xconfigure.x
 						|| window.y !=
@@ -3548,7 +3548,7 @@ static void main_loop()
 					    && (ev.xconfigure.x != 0
 						|| ev.xconfigure.y != 0)) {
 						fixed_pos = 1;
-					}
+				}*/
 				}
 				break;
 #endif
diff --git a/src/x11.c b/src/x11.c
index e0b6d9e8..609d7aa9 100644
--- a/src/x11.c
+++ b/src/x11.c
@@ -198,7 +198,7 @@ void init_window(int own_window, int w, int h, int l)
 
 			if (!fixed_pos)
 				XMoveWindow(display, window.window, window.x,
-					    window.y);
+			window.y);
 		}
 
 		{