diff --git a/qubesadmin/app.py b/qubesadmin/app.py
index 5815c56..8c6b749 100644
--- a/qubesadmin/app.py
+++ b/qubesadmin/app.py
@@ -217,7 +217,9 @@ class QubesBase(qubesadmin.base.PropertyHolder):
 
         # then search for index
         if type(label) == int or label.isdigit():
-            return self.labels.values()[int(label)]
+            for i in self.labels.values():
+                if i.index == int(label):
+                    return i
 
         raise KeyError(label)