--- lib/commands/toolcontext.c.orig	2007-02-07 20:47:50.873649500 +0000
+++ lib/commands/toolcontext.c	2007-02-07 20:47:56.658011000 +0000
@@ -773,7 +773,6 @@
 			if (!(segtype = init_segtype_fn(cmd)))
 				return 0;
 			segtype->library = lib;
-			list_add(&cmd->segtypes, &segtype->list);
 
 			list_iterate_safe(sgtl, tmp, &cmd->segtypes) {
 				segtype2 = list_item(sgtl, struct segment_type);
@@ -788,6 +787,7 @@
 				}
 
 			}
+			list_add(&cmd->segtypes, &segtype->list);
 		}
 	}
 #endif