diff --git a/dive.c b/dive.c
index 5194ff18f..f9f78d6bb 100644
--- a/dive.c
+++ b/dive.c
@@ -1074,7 +1074,7 @@ static void add_initial_gaschange(struct dive *dive, struct divecomputer *dc)
 	he = (he + 5) / 10;
 	value = o2 + (he << 16);
 
-	add_event(dc, 0, 11, 0, value, "gaschange");
+	add_event(dc, 0, 25, 0, value, "gaschange"); /* SAMPLE_EVENT_GASCHANGE2 */
 }
 
 static void dc_cylinder_renumber(struct dive *dive, struct divecomputer *dc, int mapping[])
diff --git a/parse-xml.c b/parse-xml.c
index aa2f737ec..5c031fcac 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -776,7 +776,7 @@ void add_gas_switch_event(struct dive *dive, struct divecomputer *dc, int second
 	he = (he+5) / 10;
 	value = o2 + (he << 16);
 
-	add_event(dc, seconds, 11, 0, value, "gaschange");
+	add_event(dc, seconds, 25, 0, value, "gaschange");  /* SAMPLE_EVENT_GASCHANGE2 */
 }
 
 static void get_cylinderindex(char *buffer, void *_i)