diff --git a/xCAT-server/lib/xcat/plugins/nodestat.pm b/xCAT-server/lib/xcat/plugins/nodestat.pm
index 6839ba228..1da35e23a 100644
--- a/xCAT-server/lib/xcat/plugins/nodestat.pm
+++ b/xCAT-server/lib/xcat/plugins/nodestat.pm
@@ -206,8 +206,13 @@ sub process_request_nmap {
           $installquerypossible=0; #reset possibility indicator
           %rsp=();
           unless ($deadnodes{$1}) {
+              my $shortname;
               foreach (keys %deadnodes) {
-                  if ($currnode =~ /^$_\./) {
+                  if (/\./) {
+                      $shortname = $_;
+                      $shortname =~ s/\..*//;
+                  }
+                  if ($currnode =~ /^$_\./ or ($shortname and $shortname eq $currnode)) {
                       $currnode = $_;
                       last;
                   }