diff --git a/core/src/main/java/org/openstack4j/openstack/identity/v2/domain/KeystoneAccess.java b/core/src/main/java/org/openstack4j/openstack/identity/v2/domain/KeystoneAccess.java
index d736b314c..c9e2620a3 100644
--- a/core/src/main/java/org/openstack4j/openstack/identity/v2/domain/KeystoneAccess.java
+++ b/core/src/main/java/org/openstack4j/openstack/identity/v2/domain/KeystoneAccess.java
@@ -65,13 +65,14 @@ public SortedSetMultimap<String, AccessService> getAggregatedCatalog() {
 	    if (aggregatedCatalog == null) {
 	        synchronized(this) {
 	            if (aggregatedCatalog == null) {
-	                aggregatedCatalog = TreeMultimap.create();
+					SortedSetMultimap<String, AccessService> tmpAggregatedCatalog = TreeMultimap.create();
 	                for (AccessService sc : serviceCatalog) {
 	                    String nameKey = TYPE_WITHOUT_VERSION.apply(sc.getName());
 	                    String typeKey = TYPE_WITHOUT_VERSION.apply(sc.getType());
-	                    aggregatedCatalog.put(nameKey, sc);
-                        aggregatedCatalog.put(typeKey, sc);
+	                    tmpAggregatedCatalog.put(nameKey, sc);
+                        tmpAggregatedCatalog.put(typeKey, sc);
 	                }
+					this.aggregatedCatalog = tmpAggregatedCatalog;
 	            }
 	        }
 	    }