diff --git a/core/profile.c b/core/profile.c
index bd6b037a2..0f83129ae 100644
--- a/core/profile.c
+++ b/core/profile.c
@@ -992,7 +992,7 @@ void calculate_deco_information(struct deco_state *ds, struct dive *dive, struct
 	double surface_pressure = (dc->surface_pressure.mbar ? dc->surface_pressure.mbar : get_surface_pressure_in_mbar(dive, true)) / 1000.0;
 	bool first_iteration = true;
 	int prev_deco_time = 10000000, time_deep_ceiling = 0;
-	if (!in_planner())
+	if (!in_planner() ||1)
 		ds->deco_time = 0;
 	struct deco_state *cache_data_initial = NULL;
 	lock_planner();
@@ -1041,7 +1041,7 @@ void calculate_deco_information(struct deco_state *ds, struct dive *dive, struct
 					nuclear_regeneration(ds, t1);
 					vpmb_start_gradient(ds);
 					/* For CVA iterations, calculate next gradient */
-					if (!first_iteration || in_planner())
+					if (!first_iteration || (in_planner()&&0))
 						vpmb_next_gradient(ds, ds->deco_time, surface_pressure / 1000.0);
 				}
 				entry->ceiling = deco_allowed_depth(tissue_tolerance_calc(ds, dive, depth_to_bar(entry->depth, dive)), surface_pressure, dive, !prefs.calcceiling3m);
@@ -1087,7 +1087,7 @@ void calculate_deco_information(struct deco_state *ds, struct dive *dive, struct
 			* We don't for print-mode because this info doesn't show up there
 			* If the ceiling hasn't cleared by the last data point, we need tts for VPM-B CVA calculation
 			* It is not necessary to do these calculation on the first VPMB iteration, except for the last data point */
-			if ((prefs.calcndltts && !print_mode && (decoMode() != VPMB || in_planner() || !first_iteration)) ||
+			if ((prefs.calcndltts && !print_mode && (decoMode() != VPMB || (0&&in_planner()) || !first_iteration)) ||
 			    (decoMode() == VPMB && !in_planner() && i == pi->nr - 1)) {
 				/* only calculate ndl/tts on every 30 seconds */
 				if ((entry->sec - last_ndl_tts_calc_time) < 30 && i != pi->nr - 1) {
@@ -1104,14 +1104,14 @@ void calculate_deco_information(struct deco_state *ds, struct dive *dive, struct
 				struct deco_state *cache_data = NULL;
 				cache_deco_state(ds, &cache_data);
 				calculate_ndl_tts(ds, dive, entry, gasmix, surface_pressure);
-				if (decoMode() == VPMB && !in_planner() && i == pi->nr - 1)
+				if (decoMode() == VPMB && (1||!in_planner()) && i == pi->nr - 1)
 					final_tts = entry->tts_calc;
 				/* Restore "real" deco state for next real time step */
 				restore_deco_state(cache_data, ds, decoMode() == VPMB);
 				free(cache_data);
 			}
 		}
-		if (decoMode() == VPMB && !in_planner()) {
+		if (decoMode() == VPMB && (1||!in_planner())) {
 			int this_deco_time;
 			prev_deco_time = ds->deco_time;
 			// Do we need to update deco_time?