diff --git a/management/univention-directory-manager-modules/modules/univention/admin/handlers/container/cn.py b/management/univention-directory-manager-modules/modules/univention/admin/handlers/container/cn.py
index 655191f..b780f45 100644
--- a/management/univention-directory-manager-modules/modules/univention/admin/handlers/container/cn.py
+++ b/management/univention-directory-manager-modules/modules/univention/admin/handlers/container/cn.py
@@ -235,11 +235,9 @@ def open(self):
 		for prop in self.PATH_KEYS:
 			self[prop] = '0'
 
-		for prop in self.PATH_KEYS:
-			if prop in pathResult:
-				for j in pathResult[prop]:
-					if j == self.dn:
-						self[prop] = '1'
+		for prop, attr in self.PATH_KEYS.iteritems():
+			if any(x == self.dn for x in pathResult.get(attr, [])):
+				self[prop] = '1'
 
 		self.save()
 
diff --git a/management/univention-directory-manager-modules/modules/univention/admin/handlers/container/ou.py b/management/univention-directory-manager-modules/modules/univention/admin/handlers/container/ou.py
index ab16bdc..b3667cc 100644
--- a/management/univention-directory-manager-modules/modules/univention/admin/handlers/container/ou.py
+++ b/management/univention-directory-manager-modules/modules/univention/admin/handlers/container/ou.py
@@ -237,11 +237,9 @@ def open(self):
 		for prop in self.PATH_KEYS:
 			self[prop] = '0'
 
-		for prop in self.PATH_KEYS:
-			if prop in pathResult:
-				for j in pathResult[prop]:
-					if j == self.dn:
-						self[prop] = '1'
+		for prop, attr in self.PATH_KEYS.iteritems():
+			if any(x == self.dn for x in pathResult.get(attr, [])):
+				self[prop] = '1'
 
 		self.save()