diff --git a/dive.c b/dive.c
index 00c08ed2d..19be645b6 100644
--- a/dive.c
+++ b/dive.c
@@ -2275,10 +2275,10 @@ struct picture *alloc_picture()
 void dive_create_picture(struct dive *d, char *filename, int shift_time)
 {
 	struct picture *p = alloc_picture();
-	if (p->timestamp)
-		p->timestamp += shift_time;
 	p->filename = filename;
 	picture_load_exif_data(p);
+	if (p->timestamp)
+		p->timestamp += shift_time;
 	dive_add_picture(d, p);
 	dive_set_geodata_from_picture(d, p);
 }