diff --git a/src/DynamicModel.hh b/src/DynamicModel.hh
index 7e53abb52b222bf41dfacacbebd55f26eaf57940..38c59585fe64f537899f3ab90f653f07266498af 100644
--- a/src/DynamicModel.hh
+++ b/src/DynamicModel.hh
@@ -763,22 +763,15 @@ DynamicModel::writeParamsDerivativesFile(const string &basename) const
              << "function dynamic_params_derivs(y, x, params, steady_state, it_,"
              << "ss_param_deriv, ss_param_2nd_deriv)" << endl
              << "@inbounds begin" << endl
+	     << "T = zeros(" << params_derivs_temporary_terms_idxs.size() << ")" << endl
              << tt_output.str()
              << "rp = zeros(" << equations.size() << ", "
              << symbol_table.param_nbr() << ");" << endl
              << rp_output.str()
              << "gp = zeros(" << equations.size() << ", " << getJacobianColsNbr(false) << ", " << symbol_table.param_nbr() << ");" << endl
              << gp_output.str()
-             << "rpp = zeros(" << params_derivatives.at({ 0, 2 }).size() << ",4);" << endl
-             << rpp_output.str()
-             << "gpp = zeros(" << params_derivatives.at({ 1, 2 }).size() << ",5);" << endl
-             << gpp_output.str()
-             << "hp = zeros(" << params_derivatives.at({ 2, 1 }).size() << ",5);" << endl
-             << hp_output.str()
-             << "g3p = zeros(" << params_derivatives.at({ 3, 1 }).size() << ",6);" << endl
-             << g3p_output.str()
              << "end" << endl
-             << "return (rp, gp, rpp, gpp, hp, g3p)" << endl
+             << "return (rp, gp)" << endl
              << "end" << endl;
 
       writeToFileIfModified(output, filesystem::path{basename} / "model" / "julia" / "DynamicParamsDerivs.jl");
diff --git a/src/StaticModel.hh b/src/StaticModel.hh
index 5e98f28f0db2b67e6b901ef19dd62df7d142e049..cf1734070f4625518e7150c65e9f2fabc1eddbb3 100644
--- a/src/StaticModel.hh
+++ b/src/StaticModel.hh
@@ -275,6 +275,7 @@ StaticModel::writeParamsDerivativesFile(const string &basename) const
              << "#" << endl
              << "function static_params_derivs(y, x, params)" << endl
              << "@inbounds begin" << endl
+	     << "T = zeros(" << params_derivs_temporary_terms_idxs.size() << ")" << endl
              << tt_output.str()
              << "rp = zeros(" << equations.size() << ", "
              << symbol_table.param_nbr() << ");" << endl
@@ -282,14 +283,8 @@ StaticModel::writeParamsDerivativesFile(const string &basename) const
              << "gp = zeros(" << equations.size() << ", " << symbol_table.endo_nbr() << ", "
              << symbol_table.param_nbr() << ");" << endl
              << gp_output.str()
-             << "rpp = zeros(" << params_derivatives.at({ 0, 2 }).size() << ",4);" << endl
-             << rpp_output.str()
-             << "gpp = zeros(" << params_derivatives.at({ 1, 2 }).size() << ",5);" << endl
-             << gpp_output.str()
-             << "hp = zeros(" << params_derivatives.at({ 2, 1 }).size() << ",5);" << endl
-             << hp_output.str()
              << "end" << endl
-             << "return (rp, gp, rpp, gpp, hp)" << endl
+             << "return (rp, gp)" << endl
              << "end" << endl;
 
       writeToFileIfModified(output, filesystem::path{basename} / "model" / "julia" / "StaticParamsDerivs.jl");