diff --git a/cdrskin/cdrskin_timestamp.h b/cdrskin/cdrskin_timestamp.h
index d0d323d..2b3cb28 100644
--- a/cdrskin/cdrskin_timestamp.h
+++ b/cdrskin/cdrskin_timestamp.h
@@ -1 +1 @@
-#define Cdrskin_timestamP "2012.06.17.173420"
+#define Cdrskin_timestamP "2012.07.08.103007"
diff --git a/libburn/structure.c b/libburn/structure.c
index 5e0c990..766e9b3 100644
--- a/libburn/structure.c
+++ b/libburn/structure.c
@@ -794,7 +794,9 @@ int burn_disc_cd_toc_extensions(struct burn_drive *drive, int flag)
 				if (ret > 0) {
 					ret = mmc_four_char_to_int(
 							buf->data + 24);
-					if (ret < prev_entry->track_blocks)
+					if (ret < prev_entry->track_blocks &&
+					    ((!drive->current_is_cd_profile) ||
+					   ret < prev_entry->track_blocks - 2))
 						prev_entry->track_blocks = ret;
 				}
 				prev_entry->extensions_valid |= 1;