diff --git a/matlab/set_all_parameters.m b/matlab/set_all_parameters.m
index 61a7f9da5..66587f480 100644
--- a/matlab/set_all_parameters.m
+++ b/matlab/set_all_parameters.m
@@ -7,7 +7,8 @@ function set_all_parameters(xparam1)
   ncn = estim_params_.ncn;
   np = estim_params_.np;
   Sigma_e = M_.Sigma_e;
-  
+  H = M_.H;
+
   if nvx
     var_exo = estim_params_.var_exo;
     for i=1:nvx
@@ -48,9 +49,12 @@ function set_all_parameters(xparam1)
   end
   
   if np
-    offset = offset+estim_params_.ncx+estim_params_.ncn;
-    M_.params(estim_params_.param_vals(:,1)) = deep(offset+1:end);
+    offset = nvx+ncx+nvn+ncn;
+    M_.params(estim_params_.param_vals(:,1)) = xparam1(offset+1:end);
   end
   
-  M_.Sigma_e = Sigma_e;
-  M_.H = H;
\ No newline at end of file
+  if nvx
+    M_.Sigma_e = Sigma_e;
+  end
+  if 
+  M_.H = H;