--- a/order_cmd.c	Sun Oct 15 23:48:34 2006 +0000
+++ b/order_cmd.c	Mon Oct 16 10:26:22 2006 +0000
@@ -823,7 +823,7 @@
 	bak->service_interval = v->service_interval;
 
 	/* Safe custom string, if any */
-	if ((v->string_id & 0xF800) != 0x7800) {
+	if (!IsCustomName(v->string_id)) {
 		bak->name[0] = '\0';
 	} else {
 		GetName(v->string_id & 0x7FF, bak->name);