diff --git a/StaticModel.cc b/StaticModel.cc
index bd14af7c..dbd636d5 100644
--- a/StaticModel.cc
+++ b/StaticModel.cc
@@ -1058,6 +1058,12 @@ StaticModel::computingPass(const eval_context_t &eval_context, bool no_tmp_terms
       neweqs.push_back(dynamic_cast<BinaryOpNode *>(eq_tmp->toStatic(*this)));
     }
 
+  for (unsigned int eq = 0; eq < aux_equations.size();  eq++)
+    {
+      expr_t eq_tmp = aux_equations[eq]->substituteStaticAuxiliaryDefinition();
+      neweqs.push_back(dynamic_cast<BinaryOpNode *>(eq_tmp->toStatic(*this)));
+    }
+      
   equations.clear();
   copy(neweqs.begin(),neweqs.end(),back_inserter(equations));
   // Compute derivatives w.r. to all endogenous, and possibly exogenous and exogenous deterministic
@@ -1066,8 +1072,8 @@ StaticModel::computingPass(const eval_context_t &eval_context, bool no_tmp_terms
   for (int i = 0; i < symbol_table.endo_nbr(); i++)
     {
       int id = symbol_table.getID(eEndogenous, i);
-      if (!symbol_table.isAuxiliaryVariableButNotMultiplier(id))
-                vars.insert(getDerivID(id, 0));
+      //      if (!symbol_table.isAuxiliaryVariableButNotMultiplier(id))
+      vars.insert(getDerivID(id, 0));
     }        
  
   // Launch computations