diff --git a/heat/engine/parser.py b/heat/engine/parser.py
index bc0ea3cc98..5373266a71 100644
--- a/heat/engine/parser.py
+++ b/heat/engine/parser.py
@@ -41,7 +41,6 @@ class Stack(object):
         self.context = context
         self.t = template
         self.maps = self.t.get('Mappings', {})
-        self.outputs = self.resolve_static_data(self.t.get('Outputs', {}))
         self.res = {}
         self.doc = None
         self.name = stack_name
@@ -70,6 +69,8 @@ class Stack(object):
         if parms is not None:
             self.parms.update(parms)
 
+        self.outputs = self.resolve_static_data(self.t.get('Outputs', {}))
+
         self.resources = dict((name,
                                Resource(name, data, self))
                               for (name, data) in self.t['Resources'].items())