--- GtkTreeModel.xs	07 Jul 2008 09:53:48 +1000	1.54
+++ GtkTreeModel.xs	11 Jul 2008 11:26:29 +1000	
@@ -1106,12 +1106,17 @@
 	else
 	{
 		/* otherwise return all of the columns */
-		for( i = 0; i < gtk_tree_model_get_n_columns(tree_model); i++ )
+		gint columns;
+		PUTBACK;
+		columns = gtk_tree_model_get_n_columns(tree_model);
+		for( i = 0; i < columns; i++ )
 		{
 			GValue gvalue = {0, };
 			gtk_tree_model_get_value (tree_model, iter,
 			                          i, &gvalue);
+			SPAGAIN;
 			XPUSHs (sv_2mortal (gperl_sv_from_value (&gvalue)));
+			PUTBACK;
 			g_value_unset (&gvalue);
 		}
 	}