diff --git a/gnome/ChangeLog b/gnome/ChangeLog
index 07efd9f0d..e036a170e 100644
--- a/gnome/ChangeLog
+++ b/gnome/ChangeLog
@@ -1,5 +1,8 @@
 1999-09-20  Federico Mena Quintero  <federico@redhat.com>
 
+	* gcorba.c (WindowFactory_get_windows_by_directory): Fill in the
+	sequence correctly.
+
 	* gsession.c (load_panel_info): Doh.  Fix test for presence of the
 	cwd info.
 	(load_session_info): If we could not load the panel info, do not
diff --git a/gnome/gcorba.c b/gnome/gcorba.c
index e5abe2138..cf2cc0063 100644
--- a/gnome/gcorba.c
+++ b/gnome/gcorba.c
@@ -324,11 +324,13 @@ WindowFactory_get_windows_by_directory (PortableServer_Servant servant,
 	seq->_length = n;
 	seq->_buffer = CORBA_sequence_GNOME_FileManager_Window_allocbuf (n);
 
-	for (l = containers, i = 0; l; l = l->next, i++) {
+	i = 0;
+
+	for (l = containers; l; l = l->next) {
 		pc = l->data;
 
 		if (strcmp (pc->panel->cwd, dir) == 0)
-			seq->_buffer[i] = window_reference_from_panel (pc->panel, ev);
+			seq->_buffer[i++] = window_reference_from_panel (pc->panel, ev);
 	}
 
 	return seq;