diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 7885ef15a83e8d1bda8bbba2683825062b159564..ff0aaea66d68926ef3555d63bf8f3a402eb162e5 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -2509,7 +2509,7 @@ class LUQueryClusterInfo(NoHooksLU):
       "master": cluster.master_node,
       "default_hypervisor": cluster.default_hypervisor,
       "enabled_hypervisors": cluster.enabled_hypervisors,
-      "hvparams": dict([(hypervisor_name, cluster.hvparams[hypervisor])
+      "hvparams": dict([(hypervisor_name, cluster.hvparams[hypervisor_name])
                         for hypervisor_name in cluster.enabled_hypervisors]),
       "beparams": cluster.beparams,
       "candidate_pool_size": cluster.candidate_pool_size,