diff --git a/demos/gtk-demo/tree_store.c b/demos/gtk-demo/tree_store.c
index 23885b2..69ae6fd 100644
--- a/demos/gtk-demo/tree_store.c
+++ b/demos/gtk-demo/tree_store.c
@@ -98,7 +98,7 @@ static void create_node (GtkTreeStore *model,
   gtk_tree_store_set (model, iter_children, COLUMN_0, item_children->label, -1);
 }
 
-static TreeItem create_node_recursive (GtkTreeStore *model, TreeItem *current_item)
+static GtkTreeStore create_node_recursive (GtkTreeStore *model, TreeItem *current_item)
 {
   TreeItem   *item_children;
   GtkTreeIter iter_children, iter_parent;
@@ -113,7 +113,7 @@ static TreeItem create_node_recursive (GtkTreeStore *model, TreeItem *current_it
       create_node_recursive (model, item_children);
     }
   }
-  return *item_children;
+  return *model;
 }
 
 static GtkTreeModel *
@@ -183,7 +183,7 @@ do_tree_store (GtkWidget *do_widget)
       GtkWidget *sw;
       GtkWidget *treeview;
       GtkTreeModel *tree_model;
-      GtkTreeStore *tree_store;
+      //GtkTreeStore *tree_store;
 
       /* create window, etc */
       window = gtk_window_new ();
@@ -209,15 +209,15 @@ do_tree_store (GtkWidget *do_widget)
       gtk_box_append (GTK_BOX (vbox), sw);
 
       /* create tree_model */
-      //tree_model = create_model ();  //  GtkTreeStore *model = gtk_tree_store_new (NUM_COLUMNS, G_TYPE_STRING);
-      tree_store = gtk_tree_store_new (NUM_COLUMNS, G_TYPE_STRING);
-      tree_model = create_node_recursive (*tree_store, O);
+      //  tree_model = create_model ();  //  GtkTreeStore *model = gtk_tree_store_new (NUM_COLUMNS, G_TYPE_STRING);
+      GtkTreeStore tree_store = create_node_recursive (gtk_tree_store_new (NUM_COLUMNS, G_TYPE_STRING), O);
+      //  tree_model = create_node_recursive (tree_store, O);
 
       /* create tree view */
-      treeview = gtk_tree_view_new_with_model (tree_model);
+      treeview = gtk_tree_view_new_with_model (&tree_store);
       gtk_widget_set_vexpand (treeview, TRUE);
       gtk_tree_view_set_reorderable (GTK_TREE_VIEW (treeview), TRUE);
-      g_object_unref (tree_model);
+      g_object_unref (&tree_store);
       gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)),
                                    GTK_SELECTION_MULTIPLE);