diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 137ef443f3d0928a62d3f66c06c9934ceddd1efb..11463d44decb117b18dde1bd92cdbc7ac1d5ea36 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -3267,15 +3267,15 @@ class LUOutOfBand(NoHooksLU):
       raise errors.OpPrereqError("OOB is not supported for node %s" %
                                  self.op.node_name)
 
-    self.op.node_name = node.name
     self.node = node
 
   def ExpandNames(self):
     """Gather locks we need.
 
     """
+    node_name = _ExpandNodeName(self.cfg, self.op.node_name)
     self.needed_locks = {
-      locking.LEVEL_NODE: [self.op.node_name],
+      locking.LEVEL_NODE: [node_name],
       }
 
   def Exec(self, feedback_fn):