diff --git a/dive.c b/dive.c
index caeab2312..1f3f5fd0b 100644
--- a/dive.c
+++ b/dive.c
@@ -706,6 +706,9 @@ struct dive *fixup_dive(struct dive *dive)
 	sanitize_cylinder_info(dive);
 	dive->maxcns = dive->cns;
 
+	for_each_dc(dive, dc)
+		fixup_dive_dc(dive, dc);
+
 	fixup_water_salinity(dive);
 	fixup_surface_pressure(dive);
 	fixup_meandepth(dive);
@@ -713,9 +716,6 @@ struct dive *fixup_dive(struct dive *dive)
 	fixup_watertemp(dive);
 	fixup_airtemp(dive);
 
-	for_each_dc(dive, dc)
-		fixup_dive_dc(dive, dc);
-
 	for (i = 0; i < MAX_CYLINDERS; i++) {
 		cylinder_t *cyl = dive->cylinder + i;
 		add_cylinder_description(&cyl->type);