diff --git a/pycfmodel/model/cf_model.py b/pycfmodel/model/cf_model.py
index 2cc80ef..4eb08ec 100644
--- a/pycfmodel/model/cf_model.py
+++ b/pycfmodel/model/cf_model.py
@@ -78,10 +78,11 @@ def resolve(self, extra_params=None) -> "CFModel":
         dict_value = self.dict()
 
         conditions = dict_value.pop("Conditions", {})
-        resolved_conditions = {
-            key: _extended_bool(resolve(value, extended_parameters, self.Mappings, {}))
-            for key, value in conditions.items()
-        }
+        resolved_conditions = {}
+        for key, value in conditions.items():
+            resolved_conditions.update({
+                key: _extended_bool(resolve(value, extended_parameters, self.Mappings, resolved_conditions))
+            })
 
         resources = dict_value.pop("Resources")
         resolved_resources = {