diff --git a/matlab/+occbin/solve_two_constraints.m b/matlab/+occbin/solve_two_constraints.m
index 55fff162d7501edf1f93ba9a6b14cb180229febf..80744ac50943fa24b2e3ee285cb7ad3d3c587152 100644
--- a/matlab/+occbin/solve_two_constraints.m
+++ b/matlab/+occbin/solve_two_constraints.m
@@ -234,6 +234,7 @@ for shock_period = 1:n_shocks_periods
                 err_relax = err_relaxed_constraint_new(relaxed_constraint_new & my_binding_indicator(:));
                 max_err(iter) = max(abs([err_violation;err_relax]));
                 regime_change_this_iteration = true;
+                regime_violates_constraint_in_expectation(iter) = any(binding_constraint_new & ~binding_indicator(:));
             else
                 regime_change_this_iteration = false;
                 max_err(iter) = 0;
diff --git a/matlab/plot_shock_decomposition.m b/matlab/plot_shock_decomposition.m
index bef0371442ab6c3795126ff36f3aa95b884b8be6..557fa0f8dc8208c43dfeebe8c1d408472cbb946b 100644
--- a/matlab/plot_shock_decomposition.m
+++ b/matlab/plot_shock_decomposition.m
@@ -470,13 +470,14 @@ switch type
                     q2a.aux.yss=steady_state_aux;
                 end
                 i_var0 = i_var;
+                steady_state_0 = steady_state;
                 [za, endo_names, endo_names_tex, steady_state, i_var, oo_] = ...
                     annualized_shock_decomposition(z,M_, options_, i_var, t0, options_.nobs, realtime_, vintage_, steady_state,q2a);
                 if options_.plot_shock_decomp.interactive && ~isempty(options_.plot_shock_decomp.use_shock_groups)
                     mygroup = options_.plot_shock_decomp.use_shock_groups;
                     options_.plot_shock_decomp.use_shock_groups='';
                     zafull = ...
-                        annualized_shock_decomposition(zfull(i_var0,:,:),M_, options_, i_var, t0, options_.nobs, realtime_, vintage_, steady_state,q2a);
+                        annualized_shock_decomposition(zfull(i_var0,:,:),M_, options_, i_var, t0, options_.nobs, realtime_, vintage_, steady_state_0(i_var0),q2a);
                     options_.plot_shock_decomp.use_shock_groups = mygroup;
                 end
             end