diff --git a/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm b/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm
index 5112ca68f..e7a1c74e4 100644
--- a/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm
+++ b/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm
@@ -889,7 +889,7 @@ sub defmk
     } else {
         my $invalidnodename = ();
         foreach my $node (@::allobjnames) {
-            if ($node =~ /[A-Z]/) {
+            if (($node =~ /[A-Z]/) && ((!$::opt_t) || ($::opt_t eq "node"))) {
                 $invalidnodename .= ",$node";
             }
         }
@@ -2101,7 +2101,7 @@ sub defch
                 my $newobj = ();
                 my $invalidnodename = ();
                 foreach my $node (keys %newobjects) {
-                    if ($node =~ /[A-Z]/) {
+                    if (($node =~ /[A-Z]/) && ((!$::opt_t) || ($::opt_t eq "node"))) {
                         $invalidnodename .= ",$node";
                     }
                     $newobj .= ",$node";