2 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp
index 55a42b49ff0..e9ef6838561 100644
--- a/cpp/src/IceGrid/DescriptorHelper.cpp
+++ b/cpp/src/IceGrid/DescriptorHelper.cpp
@@ -572,7 +572,6 @@ void
 ApplicationDescriptorHelper::endParsing()
 {
     _descriptor->variables = _variables->getCurrentScopeVariables();
-    _variables->remove("application");
 }
 
 const ApplicationDescriptorPtr&
diff --git a/cpp/src/IceGrid/DescriptorParser.cpp b/cpp/src/IceGrid/DescriptorParser.cpp
index 38f07c95138..611df70109f 100644
--- a/cpp/src/IceGrid/DescriptorParser.cpp
+++ b/cpp/src/IceGrid/DescriptorParser.cpp
@@ -481,6 +481,7 @@ DescriptorHandler::getApplicationDescriptor() const
     {
 	error("no application descriptor defined in this file");
     }
+    _currentApplication->instantiate();
     return _currentApplication->getDescriptor();
 }