diff --git a/xCAT-server/sbin/xcatd b/xCAT-server/sbin/xcatd
index 810984c79..11fa33df7 100755
--- a/xCAT-server/sbin/xcatd
+++ b/xCAT-server/sbin/xcatd
@@ -1230,8 +1230,7 @@ sub plugin_command {
             $$progname=$oldprogname.": $modname instance";
             unless ($handler_hash{$_} == 1) {
     	       #ok, if nodes have numbers, this sorts them numerically... roughly..
-    	       #if node doesn't, then it spews a message, need to fix
-              #my @nodes = sort {($a =~ /(\d+)/)[0] <=> ($b =~ /(\d+)/)[0] || $a cmp $b } (keys %{$handler_hash{$_}});
+    	       #if node doesn't, then it sorts out alphabetically.
               my @nodes = sort {($a =~ /(\d+)/ ? $1 : -1)[0] <=> ($b =~ /(\d+)/ ? $1 : -1)[0] || $a cmp $b } (keys %{$handler_hash{$_}});
               $req->{node}=\@nodes;
             }
@@ -1313,8 +1312,8 @@ sub plugin_command {
         if ($sock) { close $pfd; }
         unless ($handler_hash{$_} == 1) {
 	  #ok, if nodes have numbers, this sorts them numerically... roughly..
-	  #if node doesn't, then it spews a message, need to fix
-          my @nodes = sort {($a =~ /(\d+)/)[0] <=> ($b =~ /(\d+)/)[0] || $a cmp $b } (keys %{$handler_hash{$_}});
+	  #if node doesn't, then it sorts out alphabetically.
+          my @nodes = sort {($a =~ /(\d+)/ ? $1 : -1)[0] <=> ($b =~ /(\d+)/ ? $1 : -1)[0] || $a cmp $b } (keys %{$handler_hash{$_}});
           $req->{node}=\@nodes;
         }
         no strict  "refs";