diff --git a/ChangeLog b/ChangeLog
index 3b98b5731..9c85873c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-09  Havoc Pennington  <hp@pobox.com>
+
+	* src/stack.c (meta_stack_sync_to_server): hmm, and don't set
+	last_window at all if we don't ++newp. Fixes even more obscure
+	stacking bug.
+
 2002-02-09  Havoc Pennington  <hp@pobox.com>
 
 	* src/stack.c (meta_stack_sync_to_server): assign last_window
diff --git a/src/stack.c b/src/stack.c
index 9965ea403..37b4489af 100644
--- a/src/stack.c
+++ b/src/stack.c
@@ -690,7 +690,6 @@ meta_stack_sync_to_server (MetaStack *stack)
                * so we can just skip it
                */
               ++oldp;
-              last_window = *newp;
             }
           else
             {