--- stack/stack.c	2002/03/10 07:55:13	1.96
+++ stack/stack.c	2002/03/10 08:30:43	1.97
@@ -127,6 +127,7 @@
   env->gc_ref= nitem;
 
   env->gc_count++;
+  nval->gc_garb= 1;
 
   return nval;
 }
@@ -137,7 +138,7 @@
 {
   stackitem *iterator;
 
-  if(val==NULL || val->gc_garb==0)
+  if(val->gc_garb==0)
     return;
 
   val->gc_garb= 0;
@@ -167,13 +168,6 @@
   symbol *tsymb;
   int i;
 
-  /* Garb by default */
-  iterator= env->gc_ref;
-  while(iterator!=NULL) {
-    iterator->item->gc_garb= 1;
-    iterator= iterator->next;
-  }
-
   /* Mark protected values */
   iterator= env->gc_protect;
   while(iterator!=NULL) {
@@ -192,7 +186,8 @@
   for(i= 0; i<HASHTBLSIZE; i++) {
     tsymb= env->symbols[i];
     while(tsymb!=NULL) {
-      gc_mark(tsymb->val);
+      if (tsymb->val != NULL)
+	gc_mark(tsymb->val);
       tsymb= tsymb->next;
     }
   }
@@ -213,21 +208,22 @@
 	  env->gc_ref->item->content.ptr= titem->next;
 	  free(titem);
 	}
-	break;
       default:
-	break;
       }
       free(env->gc_ref->item);	/* Remove from gc_ref */
       titem= env->gc_ref->next;
       free(env->gc_ref);	/* Remove value */
       env->gc_ref= titem;
-    } else {			/* Keep values */
-      titem= env->gc_ref->next;
-      env->gc_ref->next= new_head;
-      new_head= env->gc_ref;
-      env->gc_ref= titem;
-      env->gc_count++;
+      continue;
     }
+    
+    /* Keep values */
+    titem= env->gc_ref->next;
+    env->gc_ref->next= new_head;
+    new_head= env->gc_ref;
+    new_head->item->gc_garb= 1;
+    env->gc_ref= titem;
+    env->gc_count++;
   }
 
   env->gc_limit= env->gc_count*2;
@@ -982,7 +978,7 @@
   }
 
   if(myenv.interactive) {
-    printf("Stack version $Revision: 1.96 $\n\
+    printf("Stack version $Revision: 1.97 $\n\
 Copyright (C) 2002  Mats Alritzson and Teddy Hogeborn\n\
 Stack comes with ABSOLUTELY NO WARRANTY; for details type `warranty;'.\n\
 This is free software, and you are welcome to redistribute it\n\