diff --git a/perl-xCAT/xCAT/Table.pm b/perl-xCAT/xCAT/Table.pm
index 0e28e39e3..2a3a5ae99 100644
--- a/perl-xCAT/xCAT/Table.pm
+++ b/perl-xCAT/xCAT/Table.pm
@@ -709,11 +709,11 @@ sub setAttribs
         {
             if (ref($keypairs{$_}))
             {
-                $cmd .= $_ . " = '" . $keypairs{$_}->[0] . "' AND ";
+                $cmd .= "\"$_\"" . " = '" . $keypairs{$_}->[0] . "' AND ";
             }
             else
             {
-                $cmd .= $_ . " = '" . $keypairs{$_} . "' AND ";
+                $cmd .= "\"$_\"" . " = '" . $keypairs{$_} . "' AND ";
             }
         }
         $cmd =~ s/ AND \z//;