2 files changed, 6 insertions, 0 deletions
diff --git a/core/dive.c b/core/dive.c
index 8bc66a655..351476bb8 100644
--- a/core/dive.c
+++ b/core/dive.c
@@ -336,6 +336,10 @@ void selective_copy_dive(const struct dive *s, struct dive *d, struct dive_compo
 		copy_cylinder_types(s, d);
 	if (what.weights)
 		copy_weights(&s->weightsystems, &d->weightsystems);
+	if (what.number)
+		d->number = s->number;
+	if (what.when)
+		d->when = s->when;
 }
 #undef CONDITIONAL_COPY_STRING
 
diff --git a/core/dive.h b/core/dive.h
index 9c847ee90..3e5ec1324 100644
--- a/core/dive.h
+++ b/core/dive.h
@@ -90,6 +90,8 @@ struct dive_components {
 	unsigned int tags : 1;
 	unsigned int cylinders : 1;
 	unsigned int weights : 1;
+	unsigned int number : 1;
+	unsigned int when : 1;
 };
 
 extern bool has_gaschange_event(const struct dive *dive, const struct divecomputer *dc, int idx);