diff --git a/xCAT-client/bin/xcatDBcmds b/xCAT-client/bin/xcatDBcmds
index 5b063d074..3bf2ba3d5 100755
--- a/xCAT-client/bin/xcatDBcmds
+++ b/xCAT-client/bin/xcatDBcmds
@@ -1,4 +1,6 @@
 #!/usr/bin/perl
+ot@hpcrhmn bin]# vi
+
 # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
 BEGIN
 {
@@ -106,20 +108,15 @@ foreach my $a (@ARGV)
     push(@{$cmdref->{arg}}, $a);
 }
 
-# For some commands we need to set the noderange value
-# - don't want to depend on the order of args so need to pick
-#   the operand that doesn't have an "=" sign ( ie. attr=val format)
-my @checkcmds = ("nimnodeset", "mkdsklsnode", "rmdsklsnode", "xcat2nim", "nimnodecust");
-if (grep(/^$bname$/, @checkcmds) ) { 
-	# strip off all options
-	# use getopt instead of getopts to let long options pass through
-	getopt('ismot');
-	# check the operands for a noderange
-	while (my $a = shift(@ARGV)) {
-		if (!($a =~ /=/) && !($a =~ /^-/)) {
-			$cmdref->{noderange}->[0]=$a;
-			last;
-		}
+# Set the noderange value  - needed for policy table noderange to work
+# strip off all options
+# use getopt instead of getopts to let long options pass through
+getopt('ismot');
+# check the operands for a noderange
+while (my $a = shift(@ARGV)) {
+	if (!($a =~ /=/) && !($a =~ /^-/)) {
+		$cmdref->{noderange}->[0]=$a;
+		last;
 	}
 }